@voxgig/apidef 1.2.0 → 1.4.0

package/dist/apidef.d.ts

@@ -6,23 +6,21 @@ type ApiDefOptions = {
     debug?: boolean | string;
     folder?: string;
     meta?: Record<string, any>;
+    outprefix?: string;
 };
 declare function ApiDef(opts: ApiDefOptions): {
     generate: (spec: any) => Promise<{
         ok: boolean;
+        name: string;
         processResult: {
             ok: boolean;
             msg: string;
-            results: {
-                ok: boolean;
-                msg: string;
-                err?: any;
-                transform?: any;
-            }[];
+            results: import("./transform").TransformResult[];
         };
         apimodel?: undefined;
     } | {
         ok: boolean;
+        name: string;
         apimodel: {
             main: {
                 api: {
@@ -36,7 +34,7 @@ declare function ApiDef(opts: ApiDefOptions): {
 };
 declare namespace ApiDef {
     var makeBuild: (opts: ApiDefOptions) => Promise<{
-        (model: any, build: any, ctx: any): Promise<void>;
+        (model: any, build: any, ctx: any): Promise<any>;
         step: string;
     }>;
 }

package/dist/apidef.js

@@ -42,16 +42,42 @@ const Fs = __importStar(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const openapi_core_1 = require("@redocly/openapi-core");
+const gubu_1 = require("gubu");
 const util_1 = require("@voxgig/util");
 const transform_1 = require("./transform");
+const ModelShape = (0, gubu_1.Gubu)({
+    def: String,
+    main: {
+        guide: {},
+        sdk: {},
+        def: {},
+        api: {},
+    }
+});
+const OpenModelShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(ModelShape));
+const BuildShape = (0, gubu_1.Gubu)({
+    spec: {
+        base: '',
+        path: '',
+        debug: '',
+        use: {},
+        res: [],
+        require: '',
+        log: {},
+        fs: (0, gubu_1.Any)()
+    }
+});
+const OpenBuildShape = (0, gubu_1.Gubu)((0, gubu_1.Open)(BuildShape));
 function ApiDef(opts) {
     const fs = opts.fs || Fs;
     const pino = (0, util_1.prettyPino)('apidef', opts);
     const log = pino.child({ cmp: 'apidef' });
     async function generate(spec) {
         const start = Date.now();
-        const buildspec = spec.build.spec;
-        let defpath = spec.model.def;
+        const model = OpenModelShape(spec.model);
+        const build = OpenBuildShape(spec.build);
+        const buildspec = build.spec;
+        let defpath = model.def;
         // TOOD: defpath should be independently defined
         defpath = node_path_1.default.join(buildspec.base, '..', 'def', defpath);
         log.info({
@@ -65,7 +91,7 @@ function ApiDef(opts) {
             opts,
             util: { fixName: transform_1.fixName },
             defpath: node_path_1.default.dirname(defpath),
-            model: spec.model
+            model,
         };
         const transformSpec = await (0, transform_1.resolveTransforms)(ctx);
         log.debug({
@@ -109,7 +135,7 @@ function ApiDef(opts) {
                 result: processResult, note: processResult.msg,
                 err: processResult.results[0]?.err
             });
-            return { ok: false, processResult };
+            return { ok: false, name: 'apidef', processResult };
         }
         const modelapi = { main: { api: apimodel.main.api } };
         let modelSrc = JSON.stringify(modelapi, null, 2);
@@ -120,7 +146,7 @@ function ApiDef(opts) {
         // console.log('modelPath', modelPath)
         writeChanged('api-model', modelPath, modelSrc);
         const modelBasePath = node_path_1.default.dirname(modelPath);
-        const defFilePath = node_path_1.default.join(modelBasePath, 'def-generated.jsonic');
+        const defFilePath = node_path_1.default.join(modelBasePath, (null == opts.outprefix ? '' : opts.outprefix) + 'def-generated.jsonic');
         const modelDef = { main: { def: apimodel.main.def } };
         let modelDefSrc = JSON.stringify(modelDef, null, 2);
         modelDefSrc =
@@ -130,6 +156,7 @@ function ApiDef(opts) {
         log.info({ point: 'generate-end', note: 'success', break: true });
         return {
             ok: true,
+            name: 'apidef',
             apimodel,
         };
     }
@@ -167,127 +194,28 @@ function ApiDef(opts) {
             throw err;
         }
     }
-    /*
-      async function resolveGuide(spec: any, _opts: any) {
-        if (null == spec.guide) {
-          spec.guide = spec.def + '-guide.jsonic'
-        }
-    
-        const path = Path.normalize(spec.guide)
-        let src: string
-    
-        let action = ''
-        let exists = false
-        try {
-    
-          action = 'exists'
-          let exists = fs.existsSync(path)
-    
-          log.debug({ read: 'file', what: 'guide', file: path, exists })
-    
-          if (exists) {
-            action = 'read'
-            src = fs.readFileSync(path, 'utf8')
-          }
-          else {
-            src = `
-    # API Specification Transform Guide
-    
-    @"@voxgig/apidef/model/guide.jsonic"
-    
-    guide: entity: {
-    
-    }
-    
-    guide: control: transform: openapi: order: \`
-      top,
-      entity,
-      operation,
-      field,
-      manual,
-      \`
-    
-    `
-            action = 'write'
-            fs.writeFileSync(path, src)
-          }
-        }
-        catch (err: any) {
-          log.error({ fail: action, what: 'guide', file: path, exists, err })
-          throw err
-        }
-    
-        const aopts = { path }
-        const root = Aontu(src, aopts)
-        const hasErr = root.err && 0 < root.err.length
-    
-        if (hasErr) {
-          for (let serr of root.err) {
-            let err: any = new Error('Guide model: ' + serr.msg)
-            err.cause$ = [serr]
-    
-            if ('syntax' === serr.why) {
-              err.uxmsg$ = true
-            }
-    
-            log.error({ fail: 'parse', point: 'guide-parse', file: path, err })
-    
-            if (err.uxmsg$) {
-              return
-            }
-            else {
-              err.rooterrs$ = root.err
-              throw err
-            }
-          }
-        }
-    
-        let genctx = new Context({ root })
-        const guide = spec.guideModel = root.gen(genctx)
-    
-        // TODO: collect all errors
-        if (genctx.err && 0 < genctx.err.length) {
-          const err: any = new Error('Guide build error:\n' +
-            (genctx.err.map((pe: any) => pe.msg)).join('\n'))
-          log.error({ fail: 'build', what: 'guide', file: path, err })
-          err.errs = () => genctx.err
-          throw err
-        }
-    
-        const pathParts = Path.parse(path)
-        spec.guideModelPath = Path.join(pathParts.dir, pathParts.name + '.json')
-    
-        const updatedSrc = JSON.stringify(guide, null, 2)
-    
-        writeChanged('guide-model', spec.guideModelPath, updatedSrc)
-    
-        return guide
-      }
-    */
     return {
-        // watch,
         generate,
     };
 }
 ApiDef.makeBuild = async function (opts) {
     let apidef = undefined;
+    const outprefix = null == opts.outprefix ? '' : opts.outprefix;
     const config = {
         def: opts.def || 'no-def',
         kind: 'openapi3',
-        model: opts.folder ? (opts.folder + '/api-generated.jsonic') : 'no-model',
+        model: opts.folder ?
+            (opts.folder + '/' + outprefix + 'api-generated.jsonic') : 'no-model',
         meta: opts.meta || {},
     };
     const build = async function (model, build, ctx) {
-        // console.log('APIDEF build')
-        // console.dir(ctx, { depth: null })
-        // console.dir(build, { depth: null })
         if (null == apidef) {
             apidef = ApiDef({
                 ...opts,
                 pino: build.log,
             });
         }
-        await apidef.generate({ model, build, config });
+        return await apidef.generate({ model, build, config });
     };
     build.step = 'pre';
     return build;

package/dist/apidef.js.map

@@ -1 +1 @@
-{"version":3,"file":"apidef.js","sourceRoot":"","sources":["../src/apidef.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apidef.js","sourceRoot":"","sources":["../src/apidef.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqR1C,wBAAM;AAnRR,4CAA6B;AAC7B,0DAA4B;AAC5B,yCAAmC;AAEnC,wDAAsE;AAGtE,+BAAsC;AACtC,uCAA+C;AAG/C,2CAIoB;AAcpB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC;IACtB,GAAG,EAAE,MAAM;IACX,IAAI,EAAE;QACJ,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,EAAE;KACR;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AAK7C,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;KACV;CACF,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAA,WAAI,EAAC,UAAU,CAAC,CAAC,CAAA;AAM7C,SAAS,MAAM,CAAC,IAAmB;IACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;IACxB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAEvC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAA;IAGzC,KAAK,UAAU,QAAQ,CAAC,IAAS;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAExB,MAAM,KAAK,GAAU,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/C,MAAM,KAAK,GAAU,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAE/C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAA;QAE5B,IAAI,OAAO,GAAG,KAAK,CAAC,GAAG,CAAA;QAEvB,gDAAgD;QAChD,OAAO,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAEzD,GAAG,CAAC,IAAI,CAAC;YACP,KAAK,EAAE,gBAAgB;YACvB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK;SAC1D,CAAC,CAAA;QAEF,sBAAsB;QACtB,MAAM,GAAG,GAAG;YACV,GAAG;YACH,IAAI;YACJ,IAAI;YACJ,IAAI,EAAE,EAAE,OAAO,EAAP,mBAAO,EAAE;YACjB,OAAO,EAAE,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC9B,KAAK;SACN,CAAA;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAiB,EAAC,GAAG,CAAC,CAAA;QAElD,GAAG,CAAC,KAAK,CAAC;YACR,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa;YACvC,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,IAAA,mBAAO,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;SACvD,CAAC,CAAA;QAGF,IAAI,MAAM,CAAA;QACV,IAAI,CAAC;YACH,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC3C,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;YAC5D,MAAM,GAAG,CAAA;QACX,CAAC;QAGD,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAY,EAAC,EAAE,CAAC,CAAA;QACrC,IAAI,MAAM,CAAA;QAEV,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAA,+BAAgB,EAAC;gBAC9B,MAAM;gBACN,MAAM;gBACN,WAAW,EAAE,IAAI;aAClB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;YACjE,MAAM,GAAG,CAAA;QACX,CAAC;QAGD,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE;gBACJ,GAAG,EAAE;oBACH,MAAM,EAAE,EAAE;iBACX;gBACD,GAAG,EAAE,EAAE;aACR;SACF,CAAA;QAED,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAA;QAChC,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAiB,EAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;QAEhF,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC;gBACR,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,kBAAkB;gBAC1C,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG;gBAC9C,GAAG,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG;aACnC,CAAC,CAAA;YAEF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAA;QACrD,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QACrD,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAEhD,QAAQ;YACN,oCAAoC;gBACpC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAEnE,MAAM,SAAS,GAAG,mBAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACnD,sCAAsC;QACtC,YAAY,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QAE9C,MAAM,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC7C,MAAM,WAAW,GACf,mBAAI,CAAC,IAAI,CAAC,aAAa,EACrB,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,sBAAsB,CAAC,CAAA;QAE5E,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QACrD,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAEnD,WAAW;YACT,oCAAoC;gBACpC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QAEzE,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QAEnD,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAEjE,OAAO;YACL,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ;SACT,CAAA;IACH,CAAC;IAGD,SAAS,YAAY,CAAC,KAAa,EAAE,IAAY,EAAE,OAAe;QAChE,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,CAAC;YACH,IAAI,eAAe,GAAW,EAAE,CAAA;YAChC,IAAI,GAAG,mBAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAE3B,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAE5B,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,MAAM,CAAA;gBACf,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YACjD,CAAC;YAED,OAAO,GAAG,eAAe,KAAK,OAAO,CAAA;YAErC,6DAA6D;YAE7D,GAAG,CAAC,IAAI,CAAC;gBACP,KAAK,EAAE,QAAQ,GAAG,KAAK;gBACvB,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,GAAG,IAAI;gBACjD,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO;gBAC9C,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI;aAC1C,CAAC,CAAA;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,GAAG,OAAO,CAAA;gBAChB,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC;gBACR,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;gBAChD,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG;aACnC,CAAC,CAAA;YACF,GAAG,CAAC,UAAU,GAAG,IAAI,CAAA;YACrB,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAED,OAAO;QACL,QAAQ;KACT,CAAA;AACH,CAAC;AAID,MAAM,CAAC,SAAS,GAAG,KAAK,WAAU,IAAmB;IACnD,IAAI,MAAM,GAAQ,SAAS,CAAA;IAE3B,MAAM,SAAS,GAAG,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAA;IAE9D,MAAM,MAAM,GAAG;QACb,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,QAAQ;QACzB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,UAAU;QACvE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;KACtB,CAAA;IAED,MAAM,KAAK,GAAG,KAAK,WAAU,KAAU,EAAE,KAAU,EAAE,GAAQ;QAE3D,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YACnB,MAAM,GAAG,MAAM,CAAC;gBACd,GAAG,IAAI;gBACP,IAAI,EAAE,KAAK,CAAC,GAAG;aAChB,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IACxD,CAAC,CAAA;IAED,KAAK,CAAC,IAAI,GAAG,KAAK,CAAA;IAElB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/parse.d.ts

@@ -0,0 +1,2 @@
+declare function parse(kind: string, source: any): Promise<any>;
+export { parse };

package/dist/parse.js

@@ -0,0 +1,26 @@
+"use strict";
+/* Copyright (c) 2024 Voxgig, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parse = parse;
+const openapi_core_1 = require("@redocly/openapi-core");
+async function parse(kind, source) {
+    if ('OpenAPI' === kind) {
+        return parseOpenAPI(source);
+    }
+    else {
+        throw new Error('@voxgig/apidef-parse: unknown kind: ' + kind);
+    }
+}
+async function parseOpenAPI(source) {
+    const config = await (0, openapi_core_1.createConfig)({});
+    let bundle;
+    bundle = await (0, openapi_core_1.bundleFromString)({
+        source,
+        config,
+        dereference: true,
+    });
+    // console.dir(bundle.bundle, { depth: 1 })
+    const def = bundle.bundle.parsed;
+    return def;
+}
+//# sourceMappingURL=parse.js.map

package/dist/parse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":";AAAA,4CAA4C;;AAkC1C,sBAAK;AAhCP,wDAAsE;AAGtE,KAAK,UAAU,KAAK,CAAC,IAAY,EAAE,MAAW;IAC5C,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,OAAO,YAAY,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;SACI,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,IAAI,CAAC,CAAA;IAChE,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,YAAY,CAAC,MAAW;IACrC,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAY,EAAC,EAAE,CAAC,CAAA;IACrC,IAAI,MAAM,CAAA;IAEV,MAAM,GAAG,MAAM,IAAA,+BAAgB,EAAC;QAC9B,MAAM;QACN,MAAM;QACN,WAAW,EAAE,IAAI;KAClB,CAAC,CAAA;IAEF,2CAA2C;IAE3C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAA;IAEhC,OAAO,GAAG,CAAA;AACZ,CAAC"}

package/dist/transform/entity.d.ts

@@ -1,6 +1,3 @@
-import type { TransformCtx, TransformSpec } from '../transform';
-declare function entityTransform(ctx: TransformCtx, tspec: TransformSpec, model: any, def: any): Promise<{
-    ok: boolean;
-    msg: string;
-}>;
+import type { Transform } from '../transform';
+declare const entityTransform: Transform;
 export { entityTransform };

package/dist/transform/entity.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityTransform = entityTransform;
+exports.entityTransform = void 0;
 const jostraca_1 = require("jostraca");
 const transform_1 = require("../transform");
-async function entityTransform(ctx, tspec, model, def) {
-    const { model: { main: { guide } } } = ctx;
+const entityTransform = async function (ctx, guide, tspec, model, def) {
     let msg = '';
     // console.log('DEF', def)
+    // console.log('GUIDE', guide)
     (0, jostraca_1.each)(guide.entity, (guideEntity) => {
-        const entityModel = model.main.api.entity[guideEntity.key$] = {
+        const entityName = guideEntity.key$;
+        ctx.log.debug({ point: 'guide-entity', note: entityName });
+        const entityModel = model.main.api.entity[entityName] = {
             op: {},
             field: {},
             cmd: {},
@@ -19,12 +21,16 @@ async function entityTransform(ctx, tspec, model, def) {
         };
         (0, transform_1.fixName)(entityModel, guideEntity.key$);
         (0, jostraca_1.each)(guideEntity.path, (guidePath) => {
-            const pathdef = def.paths[guidePath.key$];
+            const path = guidePath.key$;
+            const pathdef = def.paths[path];
+            // console.log('APIDEF FIND PATH', guidePath.key$, Object.keys(def.paths),
+            //  Object.keys(def.paths).includes(guidePath.key$))
             if (null == pathdef) {
-                throw new Error('APIDEF: path not found in OpenAPI: ' + guidePath.key$ +
+                throw new Error('path not found in OpenAPI: ' + path +
                     ' (entity: ' + guideEntity.name + ')');
             }
-            guidePath.parts$ = guidePath.key$.split('/');
+            // TODO: is this needed?
+            guidePath.parts$ = path.split('/');
             guidePath.params$ = guidePath.parts$
                 .filter((p) => p.startsWith('{'))
                 .map((p) => p.substring(1, p.length - 1));
@@ -32,5 +38,6 @@ async function entityTransform(ctx, tspec, model, def) {
         msg += guideEntity.name + ' ';
     });
     return { ok: true, msg };
-}
+};
+exports.entityTransform = entityTransform;
 //# sourceMappingURL=entity.js.map

package/dist/transform/entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/transform/entity.ts"],"names":[],"mappings":";;AAsDE,0CAAe;AApDjB,uCAA+B;AAI/B,4CAAsC;AAItC,KAAK,UAAU,eAAe,CAAC,GAAiB,EAAE,KAAoB,EAAE,KAAU,EAAE,GAAQ;IAC1F,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,GAAG,CAAA;IAC1C,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,0BAA0B;IAE1B,IAAA,eAAI,EAAC,KAAK,CAAC,MAAM,EAAE,CAAC,WAAgB,EAAE,EAAE;QAEtC,MAAM,WAAW,GAAQ,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG;YACjE,EAAE,EAAE,EAAE;YACN,KAAK,EAAE,EAAE;YACT,GAAG,EAAE,EAAE;YACP,EAAE,EAAE;gBACF,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;aACZ;SACF,CAAA;QAED,IAAA,mBAAO,EAAC,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;QAEtC,IAAA,eAAI,EAAC,WAAW,CAAC,IAAI,EAAE,CAAC,SAAc,EAAE,EAAE;YACxC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAEzC,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,SAAS,CAAC,IAAI;oBACpE,YAAY,GAAG,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;YAC1C,CAAC;YAED,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5C,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,MAAM;iBACjC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACxC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAErD,CAAC,CAAC,CAAA;QAEF,GAAG,IAAI,WAAW,CAAC,IAAI,GAAG,GAAG,CAAA;IAE/B,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAA;AAC1B,CAAC"}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/transform/entity.ts"],"names":[],"mappings":";;;AAEA,uCAA+B;AAI/B,4CAAsC;AAGtC,MAAM,eAAe,GAAc,KAAK,WACtC,GAAiB,EACjB,KAAY,EACZ,KAAoB,EACpB,KAAU,EACV,GAAQ;IAER,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,0BAA0B;IAC1B,8BAA8B;IAE9B,IAAA,eAAI,EAAC,KAAK,CAAC,MAAM,EAAE,CAAC,WAAgB,EAAE,EAAE;QACtC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAA;QACnC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;QAE1D,MAAM,WAAW,GAAQ,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG;YAC3D,EAAE,EAAE,EAAE;YACN,KAAK,EAAE,EAAE;YACT,GAAG,EAAE,EAAE;YACP,EAAE,EAAE;gBACF,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;aACZ;SACF,CAAA;QAED,IAAA,mBAAO,EAAC,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;QAEtC,IAAA,eAAI,EAAC,WAAW,CAAC,IAAI,EAAE,CAAC,SAAc,EAAE,EAAE;YACxC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;YAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAE/B,0EAA0E;YAC1E,oDAAoD;YAEpD,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,IAAI;oBAClD,YAAY,GAAG,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;YAC1C,CAAC;YAED,wBAAwB;YACxB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClC,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,MAAM;iBACjC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACxC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAErD,CAAC,CAAC,CAAA;QAEF,GAAG,IAAI,WAAW,CAAC,IAAI,GAAG,GAAG,CAAA;IAC/B,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAA;AAC1B,CAAC,CAAA;AAIC,0CAAe"}

package/dist/transform/field.d.ts

@@ -1,6 +1,3 @@
-import type { TransformCtx, TransformSpec } from '../transform';
-declare function fieldTransform(ctx: TransformCtx, tspec: TransformSpec, model: any, def: any): Promise<{
-    ok: boolean;
-    msg: string;
-}>;
+import type { Transform } from '../transform';
+declare const fieldTransform: Transform;
 export { fieldTransform };

package/dist/transform/field.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fieldTransform = fieldTransform;
+exports.fieldTransform = void 0;
 const jostraca_1 = require("jostraca");
 const transform_1 = require("../transform");
-async function fieldTransform(ctx, tspec, model, def) {
-    const { model: { main: { guide } } } = ctx;
+const fieldTransform = async function (ctx, guide, tspec, model, def) {
     let msg = 'fields: ';
     (0, jostraca_1.each)(guide.entity, (guideEntity) => {
-        const entityModel = model.main.api.entity[guideEntity.key$];
+        const entityName = guideEntity.key$;
+        const entityModel = model.main.api.entity[entityName];
         let fieldCount = 0;
         (0, jostraca_1.each)(guideEntity.path, (guidePath) => {
-            const pathdef = def.paths[guidePath.key$];
+            const path = guidePath.key$;
+            const pathdef = def.paths[path];
             (0, jostraca_1.each)(guidePath.op, (op) => {
-                if ('load' === op.key$) {
+                const opname = op.key$;
+                if ('load' === opname) {
                     fieldCount = fieldbuild(entityModel, pathdef, op, guidePath, guideEntity, model);
                 }
             });
@@ -20,7 +22,8 @@ async function fieldTransform(ctx, tspec, model, def) {
         msg += guideEntity.name + '=' + fieldCount + ' ';
     });
     return { ok: true, msg };
-}
+};
+exports.fieldTransform = fieldTransform;
 function fieldbuild(entityModel, pathdef, op, path, entity, model) {
     // console.log('FB-A', op, pathdef)
     let fieldCount = 0;
@@ -85,7 +88,7 @@ guide: transform: customField: {
 guide: entity: {
   pet: path: {
     '/pet/{petId}': {
-      op:{ load: 'get', create: 'post', save: 'put' }
+      op:{ load: 'get', create: 'post', update: 'put' }
     }
   }
   pet: test: {

package/dist/transform/field.js.map

@@ -1 +1 @@
-{"version":3,"file":"field.js","sourceRoot":"","sources":["../../src/transform/field.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"field.js","sourceRoot":"","sources":["../../src/transform/field.ts"],"names":[],"mappings":"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"}

package/dist/transform/manual.d.ts

@@ -1,6 +1,3 @@
-import type { TransformCtx, TransformSpec } from '../transform';
-declare function manualTransform(ctx: TransformCtx, tspec: TransformSpec, model: any, def: any): Promise<{
-    ok: boolean;
-    msg: string;
-}>;
+import type { TransformCtx, TransformSpec, TransformResult, Guide } from '../transform';
+declare const manualTransform: (ctx: TransformCtx, guide: Guide, tspec: TransformSpec, model: any, def: any) => Promise<TransformResult>;
 export { manualTransform };

package/dist/transform/manual.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.manualTransform = manualTransform;
+exports.manualTransform = void 0;
 const jsonic_next_1 = require("@jsonic/jsonic-next");
 const { deep } = jsonic_next_1.Jsonic.util;
-async function manualTransform(ctx, tspec, model, def) {
+const manualTransform = async function (ctx, guide, tspec, model, def) {
     const { model: { main: { guide: { manual } } } } = ctx;
     deep(model, manual);
     return { ok: true, msg: 'manual' };
-}
+};
+exports.manualTransform = manualTransform;
 //# sourceMappingURL=manual.js.map

package/dist/transform/manual.js.map

@@ -1 +1 @@
-{"version":3,"file":"manual.js","sourceRoot":"","sources":["../../src/transform/manual.ts"],"names":[],"mappings":";;AAoBE,0CAAe;AAnBjB,qDAA4C;AAO5C,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAM,CAAC,IAAI,CAAA;AAE5B,KAAK,UAAU,eAAe,CAAC,GAAiB,EAAE,KAAoB,EAAE,KAAU,EAAE,GAAQ;IAC1F,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,GAAG,CAAA;IAEtD,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAEnB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAA;AACpC,CAAC"}
+{"version":3,"file":"manual.js","sourceRoot":"","sources":["../../src/transform/manual.ts"],"names":[],"mappings":";;;AACA,qDAA4C;AAO5C,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAM,CAAC,IAAI,CAAA;AAE5B,MAAM,eAAe,GAAG,KAAK,WAC3B,GAAiB,EACjB,KAAY,EACZ,KAAoB,EACpB,KAAU,EACV,GAAQ;IAGR,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,GAAG,CAAA;IAEtD,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAEnB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAA;AACpC,CAAC,CAAA;AAIC,0CAAe"}

package/dist/transform/operation.d.ts

@@ -1,6 +1,3 @@
-import type { TransformCtx, TransformSpec } from '../transform';
-declare function operationTransform(ctx: TransformCtx, tspec: TransformSpec, model: any, def: any): Promise<{
-    ok: boolean;
-    msg: string;
-}>;
+import type { TransformCtx, TransformSpec, TransformResult, Guide } from '../transform';
+declare const operationTransform: (ctx: TransformCtx, guide: Guide, tspec: TransformSpec, model: any, def: any) => Promise<TransformResult>;
 export { operationTransform };

package/dist/transform/operation.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.operationTransform = operationTransform;
+exports.operationTransform = void 0;
 const jostraca_1 = require("jostraca");
 const transform_1 = require("../transform");
-async function operationTransform(ctx, tspec, model, def) {
-    const { model: { main: { guide } } } = ctx;
+const operationTransform = async function (ctx, guide, tspec, model, def) {
     let msg = 'operations: ';
     const paramBuilder = (paramMap, paramDef, entityModel, pathdef, op, path, entity, model) => {
         paramMap[paramDef.name] = {
@@ -22,18 +21,94 @@ async function operationTransform(ctx, tspec, model, def) {
         const type = queryDef.schema ? queryDef.schema.type : queryDef.type;
         (0, transform_1.fixName)(queryMap[queryDef.name], type, 'type');
     };
+    // Resolve the JSON path to the data (the "place").
+    const resolvePlace = (op, kind, pathdef) => {
+        const opname = op.key$;
+        // console.log('RP', kind, op)
+        let place = null == op.place ? '' : op.place;
+        if (null != place && '' !== place) {
+            return place;
+        }
+        const method = op.method;
+        const mdef = pathdef[method];
+        // TODO: fix getx
+        const content = 'res' === kind ?
+            ((0, jostraca_1.getx)(mdef, 'responses.200.content') ||
+                (0, jostraca_1.getx)(mdef, 'responses.201.content')) :
+            (0, jostraca_1.getx)(mdef, 'requestBody.content');
+        // console.log('RP', kind, op, 'content', null == content)
+        if (null == content) {
+            return place;
+        }
+        const schema = content['application/json']?.schema;
+        // console.log('RP', kind, op, 'schema', null == schema)
+        if (null == schema) {
+            return place;
+        }
+        const propkeys = null == schema.properties ? [] : Object.keys(schema.properties);
+        // HEURISTIC: guess place
+        if ('list' === opname) {
+            if ('array' === schema.type) {
+                place = '';
+            }
+            else {
+                if (1 === propkeys.length) {
+                    place = propkeys[0];
+                }
+                else {
+                    // Use sub property that is an array
+                    for (let pk of propkeys) {
+                        if ('array' === schema.properties[pk]?.type) {
+                            place = pk;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            if ('object' === schema.type) {
+                if (schema.properties.id) {
+                    place = ''; // top level
+                }
+                else {
+                    if (1 === propkeys.length) {
+                        place = propkeys[0];
+                    }
+                    else {
+                        // Use sub property with an id
+                        for (let pk of propkeys) {
+                            if (schema.properties[pk].properties?.id) {
+                                place = pk;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        // console.log('PLACE', op, kind, schema.type, 'P=', place)
+        return place;
+    };
     const opBuilder = {
         any: (entityModel, pathdef, op, path, entity, model) => {
-            const em = entityModel.op[op.key$] = {
+            // console.log('OP', op, pathdef, path, entity)
+            const opname = op.key$;
+            const method = op.val$;
+            const kind = transform_1.OPKIND[opname];
+            // console.log('EM', entityModel.name)
+            const em = entityModel.op[opname] = {
                 path: path.key$,
                 method: op.val$,
+                kind,
                 param: {},
                 query: {},
+                place: resolvePlace(op, kind, pathdef)
             };
             (0, transform_1.fixName)(em, op.key$);
             // Params are in the path
             if (0 < path.params$.length) {
-                let params = (0, jostraca_1.getx)(pathdef[op.val$], 'parameters?in=path') || [];
+                let params = (0, jostraca_1.getx)(pathdef[method], 'parameters?in=path') || [];
                 if (Array.isArray(params)) {
                     params.reduce((a, p) => (paramBuilder(a, p, entityModel, pathdef, op, path, entity, model), a), em.param);
                 }
@@ -54,7 +129,7 @@ async function operationTransform(ctx, tspec, model, def) {
         create: (entityModel, pathdef, op, path, entity, model) => {
             return opBuilder.any(entityModel, pathdef, op, path, entity, model);
         },
-        save: (entityModel, pathdef, op, path, entity, model) => {
+        update: (entityModel, pathdef, op, path, entity, model) => {
             return opBuilder.any(entityModel, pathdef, op, path, entity, model);
         },
         remove: (entityModel, pathdef, op, path, entity, model) => {
@@ -77,5 +152,6 @@ async function operationTransform(ctx, tspec, model, def) {
         msg += guideEntity.name + '=' + opcount + ' ';
     });
     return { ok: true, msg };
-}
+};
+exports.operationTransform = operationTransform;
 //# sourceMappingURL=operation.js.map