@voxgig/apidef 4.1.0 → 5.1.1

package/dist/types.js

@@ -2,10 +2,10 @@
 /* Copyright (c) 2025 Voxgig, MIT License */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenBuildShape = exports.OpenModelShape = exports.OpenControlShape = exports.KIT = void 0;
-const gubu_1 = require("gubu");
+const shape_1 = require("shape");
 const KIT = 'kit';
 exports.KIT = KIT;
-const ControlShape = (0, gubu_1.Gubu)({
+const ControlShape = (0, shape_1.Shape)({
     step: {
         parse: true,
         guide: true,
@@ -14,9 +14,9 @@ const ControlShape = (0, gubu_1.Gubu)({
         generate: true,
     }
 });
-const OpenControlShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ControlShape), { name: 'Control' });
+const OpenControlShape = (0, shape_1.Shape)((0, shape_1.Open)(ControlShape), { name: 'Control' });
 exports.OpenControlShape = OpenControlShape;
-const ModelShape = (0, gubu_1.Gubu)({
+const ModelShape = (0, shape_1.Shape)({
     name: String,
     def: String,
     main: {
@@ -28,9 +28,9 @@ const ModelShape = (0, gubu_1.Gubu)({
         },
     }
 });
-const OpenModelShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ModelShape), { name: 'Model' });
+const OpenModelShape = (0, shape_1.Shape)((0, shape_1.Open)(ModelShape), { name: 'Model' });
 exports.OpenModelShape = OpenModelShape;
-const BuildShape = (0, gubu_1.Gubu)({
+const BuildShape = (0, shape_1.Shape)({
     spec: {
         base: '',
         path: '',
@@ -39,7 +39,7 @@ const BuildShape = (0, gubu_1.Gubu)({
         res: [],
         require: '',
         log: {},
-        fs: (0, gubu_1.Any)(),
+        fs: (0, shape_1.Any)(),
         dryrun: false,
         buildargs: {},
         watch: {
@@ -49,6 +49,6 @@ const BuildShape = (0, gubu_1.Gubu)({
         }
     }
 });
-const OpenBuildShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(BuildShape));
+const OpenBuildShape = (0, shape_1.Shape)((0, shape_1.Open)(BuildShape));
 exports.OpenBuildShape = OpenBuildShape;
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;AAK5C,+BAAsC;AAGtC,MAAM,GAAG,GAAG,KAAK,CAAA;AAyOf,kBAAG;AAzML,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC;IACxB,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,IAAI;QAClB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACf;CACF,CAAC,CAAA;AACF,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;AAkMpE,4CAAgB;AA5LlB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,CAAC,GAAG,CAAC,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;AAiL9D,wCAAc;AA5KhB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;QACP,EAAE,EAAE,IAAA,UAAG,GAAE;QACT,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;SACV;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AA0J3C,wCAAc"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;AAK5C,iCAAwC;AAGxC,MAAM,GAAG,GAAG,KAAK,CAAA;AAyOf,kBAAG;AAzML,MAAM,YAAY,GAAG,IAAA,aAAK,EAAC;IACzB,IAAI,EAAE;QACJ,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,IAAI;QAClB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,IAAI;KACf;CACF,CAAC,CAAA;AACF,MAAM,gBAAgB,GAAG,IAAA,aAAK,EAAC,IAAA,YAAI,EAAC,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;AAkMrE,4CAAgB;AA5LlB,MAAM,UAAU,GAAG,IAAA,aAAK,EAAC;IACvB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,CAAC,GAAG,CAAC,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,aAAK,EAAC,IAAA,YAAI,EAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;AAiL/D,wCAAc;AA5KhB,MAAM,UAAU,GAAG,IAAA,aAAK,EAAC;IACvB,IAAI,EAAE;QACJ,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,EAAE;QACP,EAAE,EAAE,IAAA,WAAG,GAAE;QACT,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,EAAE;QACb,KAAK,EAAE;YACL,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;SACV;KACF;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,aAAK,EAAC,IAAA,YAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AA0J5C,wCAAc"}

package/model/apidef.jsonic

@@ -31,7 +31,7 @@ main: kit: entity: &: {
     name: string
     input: *'data'
 
-    targets: [ &: {
+    points: [ &: {
 
       active: *true
           

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/apidef",
-  "version": "4.1.0",
+  "version": "5.1.1",
   "main": "dist/apidef.js",
   "type": "commonjs",
   "types": "dist/apidef.d.ts",
@@ -40,26 +40,21 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@hapi/code": "^9.0.3",
-"@types/node": "25.5.0",
-    "json-schema-to-ts": "^3.1.1",
+    "@types/node": "25.5.0",
     "typescript": "^6.0.2"
   },
   "peerDependencies": {
-    "aontu": ">=0.39.0",
-    "memfs": ">=4.57.1"
+    "aontu": ">=0.39.0"
   },
   "dependencies": {
     "@jsonic/yaml": "0.1.4",
     "jsonic": "^2.19.0",
     "@voxgig/struct": "^0.0.10",
-    "@voxgig/util": "^0.3.0",
-    "chokidar": "^5.0.0",
-    "decircular": "^1.0.0",
+    "@voxgig/util": "^0.4.0",
     "diff": "^8.0.4",
-    "gubu": "^9.0.0",
+    "shape": "^10.0.1",
     "jostraca": "^0.28.0",
-    "ordu": "^4.1.1",
+    "ordu": "^4.2.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3"
   }

package/src/apidef.ts

@@ -82,7 +82,7 @@ const dlog = getdlog('apidef', __filename)
 
 function ApiDef(opts: ApiDefOptions) {
 
-  // TODO: gubu opts!
+  // TODO: shape opts!
   const fs = opts.fs || Fs
   const pino = prettyPino('apidef', opts)
   const log = pino.child({ cmp: 'apidef' })

package/src/builder/flow/flowHeuristic01.ts

@@ -105,10 +105,10 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
 
   if (entop.load) {
 
-    const target = findMainLoadTarget(entop.load)
+    const point = findMainLoadPoint(entop.load)
 
     // Get additional required match properties
-    each(target?.args.params, (param: any) => {
+    each(point?.args.params, (param: any) => {
       if (param.required) {
         let ancestorName = param.name
         let ancestorEntity = apimodel.main.api.entity[ancestorName]
@@ -196,8 +196,8 @@ function resolveBasicEntityFlow(ctx: any, entity: any) {
 }
 
 
-function findMainLoadTarget(op: ModelOp): ModelTarget | undefined {
-  let cands = op.targets.filter(a => '{id}' === getelem(a.parts, -1))
+function findMainLoadPoint(op: ModelOp): ModelTarget | undefined {
+  let cands = op.points.filter(a => '{id}' === getelem(a.parts, -1))
   return cands[0]
 }
 

package/src/model.ts

@@ -62,7 +62,7 @@ type ModelArg = {
 }
 
 
-// Target implementation of an operation
+// Point implementation of an operation
 type ModelTarget = {
   orig: string
   method: MethodName
@@ -93,7 +93,7 @@ type ModelTarget = {
 // Operation definition
 type ModelOp = {
   name: OpName
-  targets: ModelTarget[]
+  points: ModelTarget[]
 }
 
 

package/src/transform/args.ts

@@ -38,7 +38,7 @@ const argsTransform: Transform = async function(
 
   each(kit.entity, (ment: ModelEntity, entname: string) => {
     each(ment.op, (mop: ModelOp, opname: OpName) => {
-      each(mop.targets, (mtarget: ModelTarget) => {
+      each(mop.points, (mtarget: ModelTarget) => {
         const argdefs: ParameterDef[] = []
 
         const pathdef: PathDef = def.paths[mtarget.orig]

package/src/transform/field.ts

@@ -43,7 +43,7 @@ const fieldTransform: Transform = async function(
     for (let opname of opFieldPrecedence) {
       const mop = ment.op[opname]
       if (mop) {
-        const mtargets = mop.targets
+        const mtargets = mop.points
 
         for (let mtarget of mtargets) {
           const opfields = resolveOpFields(ment, mop, mtarget, def)

package/src/transform/flowstep.ts

@@ -123,11 +123,11 @@ const createStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.update) {
-    // Use last target as most generic
-    const target = getelem(opmap.update.targets, -1)
+    // Use last point as most generic
+    const point = getelem(opmap.update.points, -1)
     const step = newFlowStep('create', args)
 
-    each(target.args.params, (param: any) => {
+    each(point.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'
@@ -146,11 +146,11 @@ const listStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.list) {
-    // Use last target as most generic
-    const target = getelem(opmap.list.targets, -1)
+    // Use last point as most generic
+    const point = getelem(opmap.list.points, -1)
     const step = newFlowStep('list', args)
 
-    each(target.args.params, (param: any) => {
+    each(point.args.params, (param: any) => {
       step.match[param.name] = args.input?.[param.name] ?? param.name.replace(/_id/, '') + '01'
     })
 
@@ -166,11 +166,11 @@ const updateStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.update) {
-    // Use last target as most generic
-    const target = getelem(opmap.update.targets, -1)
+    // Use last point as most generic
+    const point = getelem(opmap.update.points, -1)
     const step = newFlowStep('update', args)
 
-    each(target.args.params, (param: any) => {
+    each(point.args.params, (param: any) => {
       if ('id' === param.name) {
         step.data.id = args.input?.id ?? ent.name + '01'
       }
@@ -191,11 +191,11 @@ const loadStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.load) {
-    // Use last target as most generic
-    const target = getelem(opmap.load.targets, -1)
+    // Use last point as most generic
+    const point = getelem(opmap.load.points, -1)
     const step = newFlowStep('load', args)
 
-    each(target.args.params, (param: any) => {
+    each(point.args.params, (param: any) => {
       if ('id' === param.name) {
         step.match.id = args.input?.id ?? ent.name + '01'
       }
@@ -216,11 +216,11 @@ const removeStep: MakeFlowStep = (
   args: Record<string, any>
 ) => {
   if (null != opmap.remove) {
-    // Use last target as most generic
-    const target = getelem(opmap.remove.targets, -1)
+    // Use last point as most generic
+    const point = getelem(opmap.remove.points, -1)
     const step = newFlowStep('remove', args)
 
-    each(target.args.params, (param: any) => {
+    each(point.args.params, (param: any) => {
       if ('id' === param.name) {
         step.match.id = args.input?.id ?? ent.name + '01'
       }

package/src/transform/operation.ts

@@ -136,7 +136,7 @@ function resolveOp(opname: OpName, gent: GuideEntity): undefined | ModelOp {
   if (opdesc) {
     mop = {
       name: opname,
-      targets: opdesc.paths.map((p: PathDesc) => {
+      points: opdesc.paths.map((p: PathDesc) => {
         const parts = applyRename(p)
 
         const mtarget: ModelTarget = {

package/src/transform/select.ts

@@ -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.targets, (mtarget: ModelTarget) => {
+      each(mop.points, (mtarget: ModelTarget) => {
         const pdef: PathDef = def.paths[mtarget.orig]
         resolveSelect(guide, ment, mop, mtarget, pdef)
       })
-      if (null != mop.targets && 0 < mop.targets.length) {
-        sortTargets(guide, ment, mop)
+      if (null != mop.points && 0 < mop.points.length) {
+        sortPoints(guide, ment, mop)
       }
     })
 
@@ -88,12 +88,12 @@ function resolveSelect(
 }
 
 
-function sortTargets(
+function sortPoints(
   _guide: Guide,
   _ment: ModelEntity,
   mop: ModelOp,
 ) {
-  mop.targets.sort((a: ModelTarget, b: ModelTarget) => {
+  mop.points.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.ts

@@ -5,7 +5,7 @@ import Path from 'node:path'
 
 import { getx, each, camelify } from 'jostraca'
 
-import { Gubu, Child, Exact } from 'gubu'
+import { Shape, Child, Exact } from 'shape'
 
 import { topTransform } from './transform/top'
 import { entityTransform } from './transform/entity'
@@ -73,7 +73,7 @@ const OPKIND: any = {
 }
 
 
-const GuideShape = Gubu({
+const GuideShape = Shape({
   entity: {},
   control: {},
   transform: {},

package/src/types.ts

@@ -3,7 +3,7 @@
 import * as Fs from 'node:fs'
 
 import { Pino, prettyPino } from '@voxgig/util'
-import { Gubu, Open, Any } from 'gubu'
+import { Shape, Open, Any } from 'shape'
 
 
 const KIT = 'kit'
@@ -38,7 +38,7 @@ type ApiDefOptions = {
   }
 }
 
-const ControlShape = Gubu({
+const ControlShape = Shape({
   step: {
     parse: true,
     guide: true,
@@ -47,13 +47,13 @@ const ControlShape = Gubu({
     generate: true,
   }
 })
-const OpenControlShape = Gubu(Open(ControlShape), { name: 'Control' })
+const OpenControlShape = Shape(Open(ControlShape), { name: 'Control' })
 
 type Control = ReturnType<typeof ControlShape>
 
 
 
-const ModelShape = Gubu({
+const ModelShape = Shape({
   name: String,
   def: String,
   main: {
@@ -65,12 +65,12 @@ const ModelShape = Gubu({
     },
   }
 })
-const OpenModelShape = Gubu(Open(ModelShape), { name: 'Model' })
+const OpenModelShape = Shape(Open(ModelShape), { name: 'Model' })
 
 type Model = ReturnType<typeof ModelShape>
 
 
-const BuildShape = Gubu({
+const BuildShape = Shape({
   spec: {
     base: '',
     path: '',
@@ -89,7 +89,7 @@ const BuildShape = Gubu({
     }
   }
 })
-const OpenBuildShape = Gubu(Open(BuildShape))
+const OpenBuildShape = Shape(Open(BuildShape))
 
 type Build = ReturnType<typeof BuildShape>