Fixed FK resolution bug

Author: marziply

src/lib/fixture.mjs

@@ -1,4 +1,5 @@
 import set from 'lodash/set.js'
+import { OPTIONS } from '../symbols.mjs'
 
 /**
  * An instance of a single fixture which represents a single
@@ -44,8 +45,9 @@ class Fixture {
   set (model, relations, insertMap) {
     for (const [key, pointer] of Object.entries(relations)) {
       const relation = insertMap.get(pointer)
+      const { col } = relation[OPTIONS].table.pk
 
-      set(model, key, relation[relation._options.table.pk])
+      set(model, key, relation[col])
     }
   }
 }

src/lib/model.mjs

@@ -1,4 +1,5 @@
 import { uuid } from '../utils.mjs'
+import { OPTIONS } from '../symbols.mjs'
 
 export const NOW = new Date().toISOString()
 
@@ -20,7 +21,7 @@ class Model {
 
     this.#configure(table)
 
-    this[options.keys.options] = {
+    this[OPTIONS] = {
       ...options,
       table
     }

src/lib/resolver.mjs

@@ -1,6 +1,6 @@
-import omit from 'lodash/omit.js'
 import invokeMap from 'lodash/invokeMap.js'
 import { filterValues } from '../utils.mjs'
+import { OPTIONS } from '../symbols.mjs'
 import Model from './model.mjs'
 import Table from './table.mjs'
 
@@ -76,8 +76,7 @@ class Resolver {
    * @returns {object} - Collection of relations to resolve later.
    */
   relations (model) {
-    const json = omit(model, [this.options.keys.options])
-    const relations = filterValues(json, v => v?.toString().match(/^@[\w]+/g))
+    const relations = filterValues(model, v => v?.toString().match(/^@[\w]+/g))
 
     this.applyPolymorphism(model, relations)
 
@@ -97,7 +96,7 @@ class Resolver {
       table: { columns },
       suffixes: { type, id },
       fixtures
-    } = model._options
+    } = model[OPTIONS]
 
     for (const [polyName, relationKey] of entries(relations)) {
       const polyType = polyName + type

src/symbols.mjs

@@ -0,0 +1 @@
+export const OPTIONS = Symbol('options')

src/utils.mjs

@@ -2,6 +2,7 @@ import isPlainObject from 'lodash/isPlainObject.js'
 import isArray from 'lodash/isArray.js'
 import debug from 'debug'
 import * as uuidLib from 'uuid'
+import { OPTIONS } from './symbols.mjs'
 
 const {
   keys,
@@ -25,7 +26,7 @@ export const uuid = uuidLib.default?.v4 ?? uuidLib.v4
  */
 export function toJson (instance) {
   const modelMap = keys(instance)
-    .filter(key => !!instance._options.table.columns[key])
+    .filter(key => !!instance[OPTIONS].table.columns[key])
     .map(key => {
       const cell = instance[key]
       const isJson = isPlainObject(cell) || isArray(cell)

src/zero.mjs

@@ -14,7 +14,6 @@ import Resolver from './lib/resolver.mjs'
  * @property {string} [type] - Primary key column type.
  * @property {string} directory - Path to fixture files.
  * @property {object} keys - Configurable keys for storing options relating to this program.
- * @property {string} keys.options - Key to use on Model instances for options.
  * @property {string} keys.model - Key to use for model options within the fixtures.
  * @property {object} suffixes - Polymorphic column suffixes.
  * @property {string} suffixes.type - Suffix used for the polymorphic type column.
@@ -31,7 +30,6 @@ export const DEFAULT_OPTIONS = {
     type: 'uuid'
   },
   keys: {
-    options: '_options',
     model: '_model'
   },
   suffixes: {