@voxgig/apidef 5.1.1 → 5.3.0

package/src/transform/entity.ts

@@ -98,11 +98,14 @@ function buildRelations(guideEntity: any, paths$: PathDesc[]) {
     .filter(n => 0 < n.length)
     .sort((a, b) => a.length - b.length)
 
-  // remove suffixes
+  // remove suffixes: keep only ancestors that are not a suffix of any later ancestor
   ancestors = ancestors
-    .reduce((a, n, j) =>
-    ((0 < (ancestors.slice(j + 1).filter(p => suffix(p, n))).length
-      ? null : a.push(n)), a), [])
+    .filter((n, j) => {
+      for (let k = j + 1; k < ancestors.length; k++) {
+        if (suffix(ancestors[k], n)) return false
+      }
+      return true
+    })
 
   const relations = {
     ancestors
@@ -114,9 +117,13 @@ function buildRelations(guideEntity: any, paths$: PathDesc[]) {
 }
 
 
-// True if array c is a suffix of array p,
+// True if array c is a suffix of array p.
 function suffix(p: string[], c: string[]): boolean {
-  return c.reduce((b, _, i) => (b && c[c.length - 1 - i] === p[p.length - 1 - i]), true)
+  if (c.length > p.length) return false
+  for (let i = 0; i < c.length; i++) {
+    if (c[c.length - 1 - i] !== p[p.length - 1 - i]) return false
+  }
+  return true
 }
 
 

package/src/transform/flowstep.ts

@@ -122,9 +122,9 @@ const createStep: MakeFlowStep = (
   ent: ModelEntity,
   args: Record<string, any>
 ) => {
-  if (null != opmap.update) {
+  if (null != opmap.create) {
     // Use last point as most generic
-    const point = getelem(opmap.update.points, -1)
+    const point = getelem(opmap.create.points, -1)
     const step = newFlowStep('create', args)
 
     each(point.args.params, (param: any) => {

package/src/transform/select.ts

@@ -93,6 +93,12 @@ function sortPoints(
   _ment: ModelEntity,
   mop: ModelOp,
 ) {
+  // Cache joined exist strings to avoid recomputing on every comparison.
+  const existCache = new Map<ModelTarget, string>()
+  for (const pt of mop.points) {
+    existCache.set(pt, pt.select.exist.join('\t'))
+  }
+
   mop.points.sort((a: ModelTarget, b: ModelTarget) => {
     // longest exist len first
     let order = b.select.exist.length - a.select.exist.length
@@ -103,8 +109,8 @@ function sortPoints(
       }
 
       if (0 === order) {
-        const a_exist_str = a.select.exist.join('\t')
-        const b_exist_str = b.select.exist.join('\t')
+        const a_exist_str = existCache.get(a)!
+        const b_exist_str = existCache.get(b)!
         order = a_exist_str < b_exist_str ? -1 :
           a_exist_str > b_exist_str ? 1 : 0
       }

package/src/utility.ts

@@ -29,6 +29,10 @@ const RE_JSON_KEY = /"([a-zA-Z_][a-zA-Z_0-9]*)": /g
 const RE_JSON_TRAILING_BRACE = /},/g
 const RE_JSON_COMMENT = /\n(\s*)([a-zA-Z_][a-zA-Z_0-9]*)_COMMENT:\s*"(.*)",/g
 
+const RE_BARE_KEY = /^[A-Za-z_][_A-Za-z0-9]*$/
+const isBareKey = (k: string) => RE_BARE_KEY.test(k)
+const quoteKey = (k: string) => (isBareKey(k) ? k : JSON.stringify(k))
+
 
 function makeWarner(spec: { point: string, log: Log }): Warner {
   const { point, log } = spec
@@ -101,59 +105,59 @@ function formatJsonSrc(jsonsrc: string) {
 }
 
 
+// Common irregular plurals - hoisted to module scope to avoid re-allocation per call.
+const IRREGULARS: Record<string, string> = {
+  'analytics': 'analytics',
+  'analyses': 'analysis',
+  'appendices': 'appendix',
+  'axes': 'axis',
+  'children': 'child',
+  'courses': 'course',
+  'crises': 'crisis',
+  'criteria': 'criterion',
+  // 'data': 'datum',
+  'diagnoses': 'diagnosis',
+  'feet': 'foot',
+  'furnace': 'furnaces',
+  'geese': 'goose',
+  'horses': 'horse',
+  'house': 'houses',
+  'indices': 'index',
+  'lens': 'lens',
+  'license': 'licenses',
+  'matrices': 'matrix',
+  'men': 'man',
+  'mice': 'mouse',
+  'movies': 'movie',
+  'notice': 'notices',
+  'oases': 'oasis',
+  'phrase': 'phrase',
+  'releases': 'release',
+  'people': 'person',
+  'phenomena': 'phenomenon',
+  'practice': 'practices',
+  'promise': 'promises',
+  'series': 'series',
+  'species': 'species',
+  'teeth': 'tooth',
+  'theses': 'thesis',
+  'vertices': 'vertex',
+  'women': 'woman',
+  'yes': 'yes',
+}
+
 function depluralize(word: string): string {
   if (!word || word.length === 0) {
     return word
   }
 
-  // Common irregular plurals
-  const irregulars: Record<string, string> = {
-    'analytics': 'analytics',
-    'analyses': 'analysis',
-    'appendices': 'appendix',
-    'axes': 'axis',
-    'children': 'child',
-    'courses': 'course',
-    'crises': 'crisis',
-    'criteria': 'criterion',
-    // 'data': 'datum',
-    'diagnoses': 'diagnosis',
-    'feet': 'foot',
-    'furnace': 'furnaces',
-    'geese': 'goose',
-    'horses': 'horse',
-    'house': 'houses',
-    'indices': 'index',
-    'lens': 'lens',
-    'license': 'licenses',
-    'matrices': 'matrix',
-    'men': 'man',
-    'mice': 'mouse',
-    'movies': 'movie',
-    'notice': 'notices',
-    'oases': 'oasis',
-    'phrase': 'phrase',
-    'releases': 'release',
-    'people': 'person',
-    'phenomena': 'phenomenon',
-    'practice': 'practices',
-    'promise': 'promises',
-    'series': 'series',
-    'species': 'species',
-    'teeth': 'tooth',
-    'theses': 'thesis',
-    'vertices': 'vertex',
-    'women': 'woman',
-    'yes': 'yes',
-  }
-
-  if (irregulars[word]) {
-    return irregulars[word]
+  if (IRREGULARS[word]) {
+    return IRREGULARS[word]
   }
 
-  for (let ending in irregulars) {
+  for (let ending in IRREGULARS) {
     if (word.endsWith(ending)) {
-      return word.replace(ending, irregulars[ending])
+      return word.replace(ending, IRREGULARS[ending])
     }
   }
 
@@ -527,18 +531,12 @@ function formatJSONIC(
 
   if (undefined === val) return ''
 
-  val = decircular(val)
-
   const hsepd = opts?.hsepd ?? 1
   const showd = !!opts?.$
   const useColor = opts?.color ?? false
   const maxlines = opts?.maxlines ?? Number.MAX_VALUE
   const exclude = opts?.exclude ?? []
 
-  const space = '  '
-  const isBareKey = (k: string) => /^[A-Za-z_][_A-Za-z0-9]*$/.test(k)
-  const quoteKey = (k: string) => (isBareKey(k) ? k : JSON.stringify(k))
-
   // ANSI color codes
   const colors = {
     reset: '\x1b[0m',
@@ -583,6 +581,25 @@ function formatJSONIC(
     try { return JSON.stringify(c) } catch { return String(c) }
   }
 
+  return renderJSONIC(val, hsepd, showd, useColor, maxlines, exclude, c,
+    renderPrimitive, renderComment)
+}
+
+
+function renderJSONIC(
+  val: any,
+  hsepd: number,
+  showd: boolean,
+  useColor: boolean,
+  maxlines: number,
+  exclude: string[],
+  c: (color: any, text: string) => string,
+  renderPrimitive: (v: any) => string,
+  renderComment: (c: any) => string | null,
+): string {
+
+  const space = '  '
+
   type ValueFrame = {
     kind: 'value'
     value: any
@@ -597,6 +614,8 @@ function formatJSONIC(
     indentLevel: number
   }
 
+  const seen = new WeakSet()
+
   let stack = new Array<ValueFrame | CloseFrame | undefined>(32)
   let top = -1
 
@@ -637,6 +656,13 @@ function formatJSONIC(
       continue
     }
 
+    // Circular reference detected — fall back to decircular
+    if (seen.has(v)) {
+      return renderJSONIC(decircular(val), hsepd, showd, useColor, maxlines, exclude, c,
+        renderPrimitive, renderComment)
+    }
+    seen.add(v)
+
     if (Array.isArray(v)) {
       const arr = v as any[]
       if (arr.length === 0) {