@voxgig/apidef 3.1.1 → 3.4.0

package/src/transform/args.ts

@@ -21,7 +21,7 @@ import type {
   OpName,
   ModelOp,
   ModelEntity,
-  ModelAlt,
+  ModelTarget,
   ModelArg,
 } from '../model'
 
@@ -38,16 +38,16 @@ const argsTransform: Transform = async function(
 
   each(kit.entity, (ment: ModelEntity, entname: string) => {
     each(ment.op, (mop: ModelOp, opname: OpName) => {
-      each(mop.alts, (malt: ModelAlt) => {
+      each(mop.targets, (mtarget: ModelTarget) => {
         const argdefs: ParameterDef[] = []
 
-        const pathdef: PathDef = def.paths[malt.orig]
+        const pathdef: PathDef = def.paths[mtarget.orig]
         argdefs.push(...(pathdef.parameters ?? []))
 
-        const opdef: MethodDef = (pathdef as any)[malt.method.toLowerCase()]
+        const opdef: MethodDef = (pathdef as any)[mtarget.method.toLowerCase()]
         argdefs.push(...(opdef.parameters ?? []))
 
-        resolveArgs(ment, mop, malt, argdefs)
+        resolveArgs(ment, mop, mtarget, argdefs)
       })
 
     })
@@ -67,11 +67,11 @@ const ARG_KIND: Record<string, ModelArg["kind"]> = {
 }
 
 
-function resolveArgs(ment: ModelEntity, mop: ModelOp, malt: ModelAlt, argdefs: ParameterDef[]) {
+function resolveArgs(ment: ModelEntity, mop: ModelOp, mtarget: ModelTarget, argdefs: ParameterDef[]) {
   each(argdefs, (argdef: ParameterDef) => {
     const orig = depluralize(snakify(argdef.name))
     const kind = ARG_KIND[argdef.in] ?? 'query'
-    const name = malt.rename[kind]?.[orig] ?? orig
+    const name = mtarget.rename[kind]?.[orig] ?? orig
     const marg: ModelArg = {
       name,
       orig,
@@ -85,7 +85,8 @@ function resolveArgs(ment: ModelEntity, mop: ModelOp, malt: ModelAlt, argdefs: P
     }
 
     // insert sorted by name
-    let kindargs = (malt.args[marg.kind] = malt.args[marg.kind] ?? [])
+    const argsKey = (marg.kind === 'param' ? 'params' : marg.kind) as keyof typeof mtarget.args
+    let kindargs = (mtarget.args[argsKey] = mtarget.args[argsKey] ?? [])
     kindargs.push(marg)
     kindargs.sort((a: ModelArg, b: ModelArg) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0)
   })

package/src/transform/field.ts

@@ -20,7 +20,7 @@ import type {
   OpName,
   ModelOp,
   ModelEntity,
-  ModelAlt,
+  ModelTarget,
   ModelField,
 } from '../model'
 
@@ -43,10 +43,10 @@ const fieldTransform: Transform = async function(
     for (let opname of opFieldPrecedence) {
       const mop = ment.op[opname]
       if (mop) {
-        const malts = mop.alts
+        const mtargets = mop.targets
 
-        for (let malt of malts) {
-          const opfields = resolveOpFields(ment, mop, malt, def)
+        for (let mtarget of mtargets) {
+          const opfields = resolveOpFields(ment, mop, mtarget, def)
 
           for (let opfield of opfields) {
             if (!seen[opfield.name]) {
@@ -54,7 +54,7 @@ const fieldTransform: Transform = async function(
               seen[opfield.name] = opfield
             }
             else {
-              mergeField(ment, mop, malt, def, seen[opfield.name], opfield)
+              mergeField(ment, mop, mtarget, def, seen[opfield.name], opfield)
             }
           }
         }
@@ -76,11 +76,11 @@ const fieldTransform: Transform = async function(
 function resolveOpFields(
   ment: ModelEntity,
   mop: ModelOp,
-  malt: ModelAlt,
+  mtarget: ModelTarget,
   def: any
 ): ModelField[] {
   const mfields: ModelField[] = []
-  const fielddefs = findFieldDefs(ment, mop, malt, def)
+  const fielddefs = findFieldDefs(ment, mop, mtarget, def)
 
   for (let fielddef of fielddefs) {
     const fieldname = (fielddef as any).key$ as string
@@ -100,13 +100,13 @@ function resolveOpFields(
 function findFieldDefs(
   _ment: ModelEntity,
   mop: ModelOp,
-  malt: ModelAlt,
+  mtarget: ModelTarget,
   def: any
 ): SchemaDef[] {
   const fielddefs: SchemaDef[] = []
-  const pathdef = def.paths[malt.orig]
+  const pathdef = def.paths[mtarget.orig]
 
-  const method = malt.method.toLowerCase()
+  const method = mtarget.method.toLowerCase()
   const opdef: any = pathdef[method]
 
   if (opdef) {
@@ -160,7 +160,7 @@ function findFieldDefs(
 function mergeField(
   ment: ModelEntity,
   mop: ModelOp,
-  malt: ModelAlt,
+  mtarget: ModelTarget,
   def: any,
   exisingField: ModelField,
   newField: ModelField

package/src/transform/flowstep.ts

@@ -123,10 +123,17 @@ const createStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.update) {
-    // Use last alt as most generic
-    const alt = getelem(opmap.update.alts, -1)
+    // Use last target as most generic
+    const target = getelem(opmap.update.targets, -1)
     const step = newFlowStep('create', args)
 
+    each(target.args.params, (param: any) => {
+      // id should not be here in the first place
+      if ('id' !== param.name) {
+        step.match[param.name] = args.input?.[param.name] ?? param.name.replace(/_id/, '') + '01'
+      }
+    })
+
     flow.step.push(step)
   }
 }
@@ -139,11 +146,11 @@ const listStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.list) {
-    // Use last alt as most generic
-    const alt = getelem(opmap.list.alts, -1)
+    // Use last target as most generic
+    const target = getelem(opmap.list.targets, -1)
     const step = newFlowStep('list', args)
 
-    each(alt.args.param, (param: any) => {
+    each(target.args.params, (param: any) => {
       step.match[param.name] = args.input?.[param.name] ?? param.name.replace(/_id/, '') + '01'
     })
 
@@ -159,11 +166,11 @@ const updateStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.update) {
-    // Use last alt as most generic
-    const alt = getelem(opmap.update.alts, -1)
+    // Use last target as most generic
+    const target = getelem(opmap.update.targets, -1)
     const step = newFlowStep('update', args)
 
-    each(alt.args.param, (param: any) => {
+    each(target.args.params, (param: any) => {
       if ('id' === param.name) {
         step.data.id = args.input?.id ?? ent.name + '01'
       }
@@ -184,11 +191,11 @@ const loadStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.load) {
-    // Use last alt as most generic
-    const alt = getelem(opmap.load.alts, -1)
+    // Use last target as most generic
+    const target = getelem(opmap.load.targets, -1)
     const step = newFlowStep('load', args)
 
-    each(alt.args.param, (param: any) => {
+    each(target.args.params, (param: any) => {
       if ('id' === param.name) {
         step.match.id = args.input?.id ?? ent.name + '01'
       }
@@ -209,11 +216,11 @@ const removeStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.remove) {
-    // Use last alt as most generic
-    const alt = getelem(opmap.remove.alts, -1)
+    // Use last target as most generic
+    const target = getelem(opmap.remove.targets, -1)
     const step = newFlowStep('remove', args)
 
-    each(alt.args.param, (param: any) => {
+    each(target.args.params, (param: any) => {
       if ('id' === param.name) {
         step.match.id = args.input?.id ?? ent.name + '01'
       }

package/src/transform/operation.ts

@@ -19,7 +19,7 @@ import type {
   OpName,
   ModelOpMap,
   ModelOp,
-  ModelAlt,
+  ModelTarget,
 } from '../model'
 
 
@@ -136,10 +136,10 @@ function resolveOp(opname: OpName, gent: GuideEntity): undefined | ModelOp {
   if (opdesc) {
     mop = {
       name: opname,
-      alts: opdesc.paths.map((p: PathDesc) => {
+      targets: opdesc.paths.map((p: PathDesc) => {
         const parts = applyRename(p)
 
-        const malt: ModelAlt = {
+        const mtarget: ModelTarget = {
           orig: p.orig,
           parts,
           rename: p.rename,
@@ -151,10 +151,10 @@ function resolveOp(opname: OpName, gent: GuideEntity): undefined | ModelOp {
           }
         }
 
-        malt.transform.req = malt.transform.req ?? '`reqdata`'
-        malt.transform.res = malt.transform.res ?? '`body`'
+        mtarget.transform.req = mtarget.transform.req ?? '`reqdata`'
+        mtarget.transform.res = mtarget.transform.res ?? '`body`'
 
-        return malt
+        return mtarget
       })
     }
   }

package/src/transform/select.ts

@@ -20,7 +20,7 @@ import type {
   OpName,
   ModelOp,
   ModelEntity,
-  ModelAlt,
+  ModelTarget,
   ModelArg,
 } from '../model'
 
@@ -36,12 +36,12 @@ const selectTransform: Transform = async function(
 
   each(kit.entity, (ment: ModelEntity, _entname: string) => {
     each(ment.op, (mop: ModelOp, _opname: OpName) => {
-      each(mop.alts, (malt: ModelAlt) => {
-        const pdef: PathDef = def.paths[malt.orig]
-        resolveSelect(guide, ment, mop, malt, pdef)
+      each(mop.targets, (mtarget: ModelTarget) => {
+        const pdef: PathDef = def.paths[mtarget.orig]
+        resolveSelect(guide, ment, mop, mtarget, pdef)
       })
-      if (null != mop.alts && 0 < mop.alts.length) {
-        sortAlts(guide, ment, mop)
+      if (null != mop.targets && 0 < mop.targets.length) {
+        sortTargets(guide, ment, mop)
       }
     })
 
@@ -56,13 +56,13 @@ function resolveSelect(
   guide: Guide,
   ment: ModelEntity,
   _mop: ModelOp,
-  malt: ModelAlt,
+  mtarget: ModelTarget,
   _pdef: PathDef
 ) {
-  const select: any = malt.select
-  const margs: any = malt.args
+  const select: any = mtarget.select
+  const margs: any = mtarget.args
 
-  const argkinds = ['param', 'query', 'header', 'cookie']
+  const argkinds = ['params', 'query', 'header', 'cookie']
 
   argkinds.map((kind: string) => {
     each(margs[kind], (marg: ModelArg) => {
@@ -75,7 +75,7 @@ function resolveSelect(
   select.exist.sort()
 
   const gent = guide.entity[ment.name]
-  const gpath = gent.path[malt.orig]
+  const gpath = gent.path[mtarget.orig]
 
   if (gpath.action) {
     const actname = Object.keys(gpath.action)[0]
@@ -88,12 +88,12 @@ function resolveSelect(
 }
 
 
-function sortAlts(
+function sortTargets(
   _guide: Guide,
   _ment: ModelEntity,
   mop: ModelOp,
 ) {
-  mop.alts.sort((a: ModelAlt, b: ModelAlt) => {
+  mop.targets.sort((a: ModelTarget, b: ModelTarget) => {
     // longest exist len first
     let order = b.select.exist.length - a.select.exist.length
     if (0 === order) {

package/src/transform/top.ts

@@ -1,5 +1,5 @@
 
-import { joinurl } from '@voxgig/struct'
+import { join } from '@voxgig/struct'
 
 import { KIT } from '../types'
 
@@ -47,7 +47,7 @@ const topTransform = async function(
   // Swagger 2.0
   if (def.host) {
     kit.info.servers.push({
-      url: (def.schemes?.[0] ?? 'https') + '://' + joinurl([def.host, def.basePath])
+      url: (def.schemes?.[0] ?? 'https') + '://' + join([def.host, def.basePath], '/', true)
     })
   }
 

package/src/types.ts

@@ -291,7 +291,7 @@ export type {
   ModelFieldOp,
   ModelField,
   ModelArg,
-  ModelAlt,
+  ModelTarget,
   ModelOp,
   ModelEntity,
 } from './model'

package/src/utility.ts

@@ -6,7 +6,12 @@ import { snakify, camelify, kebabify, each } from 'jostraca'
 import { decircular } from '@voxgig/util'
 
 import {
-  slice, merge, inject, clone, isnode, walk, transform, select
+  slice, merge, inject, clone, isnode, walk, transform, select,
+  Injection,
+  M_VAL,
+  M_KEYPRE,
+  M_KEYPOST,
+
 } from '@voxgig/struct'
 
 
@@ -17,6 +22,8 @@ import type {
 } from './types'
 
 
+const KONSOLE_LOG = console['log']
+
 
 function makeWarner(spec: { point: string, log: Log }): Warner {
   const { point, log } = spec
@@ -222,26 +229,28 @@ function capture(data: any, shape: any): Record<string, any> {
   })
 
   if (0 < errs.length) {
-    console.log('ERRS', errs)
+    KONSOLE_LOG('ERRS', errs)
     dlog(errs)
   }
   return meta.capture
 }
 
 
-function $CAPTURE(inj: any) {
+function $CAPTURE(inj: Injection) {
   // Set prop foo with value at x: { x: { '`$CAPTURE`': 'foo' } }
-  if ('key:pre' === inj.mode) {
+  if (M_KEYPRE === inj.mode) {
     const { val, prior } = inj
-    const { dparent, key } = prior
-    const dval = dparent?.[key]
-    if (undefined !== dval) {
-      inj.meta.capture[val] = dval
+    if (null != prior) {
+      const { dparent, key } = prior
+      const dval = dparent?.[key]
+      if (undefined !== dval) {
+        inj.meta.capture[val] = dval
+      }
     }
   }
 
   // Use key x as prop name: { x: '`$CAPTURE`': }
-  else if ('val' === inj.mode) {
+  else if (M_VAL === inj.mode) {
     const { key, dparent } = inj
     const dval = dparent?.[key]
     if (undefined !== dval) {
@@ -251,22 +260,28 @@ function $CAPTURE(inj: any) {
 }
 
 
-function $APPEND(inj: any, val: any, ref: any, store: any) {
+function $APPEND(inj: Injection, val: any, ref: any, store: any) {
   // Set prop foo with value at x: { x: { '`$CAPTURE`': 'foo' } }
-  if ('key:pre' === inj.mode) {
+  if (M_KEYPRE === inj.mode) {
     const { val, prior } = inj
-    const { dparent, key } = prior
-    const dval = dparent?.[key]
-    if (undefined !== dval) {
-      inj.meta.capture[val] = (inj.meta.capture[val] || [])
-      inj.meta.capture[val].push(dval)
+    if (null != prior) {
+      const { dparent, key } = prior
+      const dval = dparent?.[key]
+      if (undefined !== dval) {
+        inj.meta.capture[val] = (inj.meta.capture[val] || [])
+        inj.meta.capture[val].push(dval)
+      }
     }
   }
 
 
-  else if ('val' === inj.mode) {
+  else if (M_VAL === inj.mode) {
     inj.keyI = inj.keys.length
 
+    if (null == inj.prior) {
+      return
+    }
+
     const [_, prop, xform] = inj.parent
     const { key, dparent } = inj.prior
     const dval = dparent?.[key]
@@ -291,28 +306,30 @@ function $APPEND(inj: any, val: any, ref: any, store: any) {
 
 
 
-function $ANY(inj: any, _val: any, _ref: any, store: any) {
-  if ('key:pre' === inj.mode) {
+function $ANY(inj: Injection, _val: any, _ref: any, store: any) {
+  if (M_KEYPRE === inj.mode) {
     const { prior } = inj
     const child = inj.parent[inj.key]
-    const { dparent, key } = prior
-    const dval = dparent?.[key]
-    if (isnode(dval)) {
-      for (let n of Object.entries(dval)) {
-        let vstore = { ...store }
-        vstore.$TOP = { [n[0]]: n[1] }
-        inject(clone({ [n[0]]: child }), vstore, {
-          meta: inj.meta,
-          errs: inj.errs,
-        })
+    if (null != prior) {
+      const { dparent, key } = prior
+      const dval = dparent?.[key]
+      if (isnode(dval)) {
+        for (let n of Object.entries(dval)) {
+          let vstore = { ...store }
+          vstore.$TOP = { [n[0]]: n[1] }
+          inject(clone({ [n[0]]: child }), vstore, {
+            meta: inj.meta,
+            errs: inj.errs,
+          })
+        }
       }
     }
   }
 }
 
 
-function $SELECT(inj: any, _val: any, _ref: any, store: any) {
-  if ('val' === inj.mode) {
+function $SELECT(inj: Injection, _val: any, _ref: any, store: any) {
+  if (M_VAL === inj.mode) {
     inj.keyI = inj.keys.length
 
     let [_, selector, descendor] = inj.parent
@@ -352,8 +369,12 @@ function $SELECT(inj: any, _val: any, _ref: any, store: any) {
 }
 
 
-function $RECASE(inj: any, val: any, ref: any, store: any) {
-  if ('key:pre' === inj.mode) {
+function $RECASE(inj: Injection, val: any, ref: any, store: any) {
+  if (
+    M_KEYPRE === inj.mode
+    && null != inj.prior
+    && null != inj.prior.prior
+  ) {
     const dval = inj.parent[inj.key]
 
     // TODO: handle paths more generally! use inj.prior?
@@ -727,19 +748,22 @@ function warnOnError(where: string, warn: Warner, fn: Function, result?: any) {
 
 function debugpath(pathStr: string, methodName: string | null | undefined, ...args: any[]): void {
   const apipath = process.env.APIDEF_DEBUG_PATH
-  if (!apipath) return
 
-  const [targetPath, targetMethod] = apipath.split(':')
+  if (null == apipath || '' === apipath) return
 
-  // Check if path matches
-  if (pathStr !== targetPath) return
+  if ('ALL' !== apipath) {
+    const [targetPath, targetMethod] = apipath.split(':')
 
-  // If a method is specified in apipath and we have a method name, check if it matches
-  if (targetMethod && methodName) {
-    if (methodName.toLowerCase() !== targetMethod.toLowerCase()) return
+    // Check if path matches
+    if (pathStr !== targetPath) return
+
+    // If a method is specified in apipath and we have a method name, check if it matches
+    if (targetMethod && methodName) {
+      if (methodName.toLowerCase() !== targetMethod.toLowerCase()) return
+    }
   }
 
-  console.log(methodName || '', ...args)
+  KONSOLE_LOG(methodName || '', ...args)
 }
 
 
@@ -807,12 +831,14 @@ function relativizePath(path: string): string {
 }
 
 
+// NOTE: removes inactive items by default
 function getModelPath(
   model: any,
   path: string,
-  flags?: { required?: boolean }
+  flags?: { required?: boolean, only_active?: boolean }
 ): any {
   const required = flags?.required ?? true
+  const only_active = flags?.only_active ?? true
 
   if (path === '') {
     if (required) {
@@ -876,6 +902,26 @@ function getModelPath(
     current = current[part]
   }
 
+  if (current && only_active) {
+    if (false === current.active) {
+      current = undefined
+    }
+    if ('object' === typeof current) {
+      const out: any = Array.isArray(current) ? [] : {}
+      Object.entries(current).map((n: any) => {
+        if (null != n[1] && false !== n[1].active) {
+          if (Array.isArray(out)) {
+            out.push(n[1])
+          }
+          else {
+            out[n[0]] = n[1]
+          }
+        }
+      })
+      current = out
+    }
+  }
+
   return current
 }