@voxgig/sdkgen 0.0.7 → 0.1.0

package/dist/prepare-openapi.d.ts

@@ -0,0 +1,2 @@
+declare function PrepareOpenAPI(inspec: any, ctx: any): Promise<boolean>;
+export { PrepareOpenAPI };

package/dist/prepare-openapi.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrepareOpenAPI = PrepareOpenAPI;
+async function PrepareOpenAPI(inspec, ctx) {
+    // TODO: avoid rebuilding if unchanged
+    // const source = Fs.readFileSync(ctx.def, 'utf8')
+    // const config = await createConfig({})
+    // const bundle = await bundleFromString({
+    //   source,
+    //   config,
+    //   dereference: true,
+    // })
+    // // console.log('BUNDLE', bundle)
+    // Fs.writeFileSync(
+    //   ctx.folder + '/../model/def.jsonic',
+    //   JSON.stringify(bundle.bundle.parsed, null, 2)
+    // )
+    // const spec: any = {}
+    // spec.main = {
+    //   sdk: {
+    //     api: {
+    //       // cmap
+    //       /*
+    //               path: each(bundle.bundle.parsed.paths, (path: any) => ({
+    //                 param: {}
+    //                 }))
+    //                 */
+    //     }
+    //   }
+    // }
+    // Fs.writeFileSync(
+    //   ctx.folder + '/../model/spec.jsonic',
+    //   JSON.stringify(spec, null, 2)
+    // )
+    return false;
+}
+//# sourceMappingURL=prepare-openapi.js.map

package/dist/prepare-openapi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepare-openapi.js","sourceRoot":"","sources":["../src/prepare-openapi.ts"],"names":[],"mappings":";;AAyDE,wCAAc;AAjDhB,KAAK,UAAU,cAAc,CAAC,MAAW,EAAE,GAAQ;IAEjD,sCAAsC;IAEtC,kDAAkD;IAElD,wCAAwC;IACxC,0CAA0C;IAC1C,YAAY;IACZ,YAAY;IACZ,uBAAuB;IACvB,KAAK;IAEL,mCAAmC;IAEnC,oBAAoB;IACpB,yCAAyC;IACzC,kDAAkD;IAClD,IAAI;IAGJ,uBAAuB;IAEvB,gBAAgB;IAChB,WAAW;IACX,aAAa;IACb,gBAAgB;IAChB,WAAW;IACX,yEAAyE;IACzE,4BAA4B;IAC5B,sBAAsB;IACtB,qBAAqB;IACrB,QAAQ;IACR,MAAM;IACN,IAAI;IAGJ,oBAAoB;IACpB,0CAA0C;IAC1C,kCAAkC;IAClC,IAAI;IAGJ,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/sdkgen.d.ts

@@ -1,12 +1,17 @@
 type SdkGenOptions = {
     folder: string;
+    def?: string;
     fs: any;
+    model?: {
+        folder: string;
+        entity: any;
+    };
 };
 declare function SdkGen(opts: SdkGenOptions): {
-    generate: (spec: any) => void;
+    generate: (spec: any) => Promise<void>;
 };
 declare namespace SdkGen {
-    var makeBuild: (root: any, opts: SdkGenOptions) => (model: any, build: any) => void;
+    var makeBuild: (root: any, opts: SdkGenOptions) => Promise<(model: any, build: any) => Promise<void>>;
 }
 export type { SdkGenOptions, };
 export { SdkGen, };

package/dist/sdkgen.js

@@ -27,14 +27,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SdkGen = SdkGen;
 const Fs = __importStar(require("node:fs"));
 const jostraca_1 = require("jostraca");
+const apidef_1 = require("@voxgig/apidef");
+const prepare_openapi_1 = require("./prepare-openapi");
 function SdkGen(opts) {
     const fs = opts.fs || Fs;
     const folder = opts.folder || '.';
+    const def = opts.def || 'def.yml';
     const jostraca = (0, jostraca_1.Jostraca)();
     // const { cmp, each, Project, Folder, File, Code } = jostraca
-    function generate(spec) {
+    async function generate(spec) {
         const { model, root } = spec;
-        jostraca.generate({ fs, folder }, () => root({ model }));
+        /*
+        if (await prepare(spec, { fs, folder, def })) {
+          return
+        }
+        */
+        try {
+            jostraca.generate({ fs, folder }, () => root({ model }));
+        }
+        catch (err) {
+            console.log('SDKGEN ERROR: ', err);
+            throw err;
+        }
+    }
+    async function prepare(spec, ctx) {
+        return await (0, prepare_openapi_1.PrepareOpenAPI)(spec, ctx);
     }
     return {
         generate,
@@ -42,9 +59,22 @@ function SdkGen(opts) {
         // Project, Folder, File, Code
     };
 }
-SdkGen.makeBuild = function (root, opts) {
+SdkGen.makeBuild = async function (root, opts) {
+    console.log('SDKGEN makeBuild');
     const sdkgen = SdkGen(opts);
-    return function build(model, build) {
+    const apidef = (0, apidef_1.ApiDef)();
+    const spec = {
+        def: opts.def,
+        kind: 'openapi-3',
+        model: opts.model ? (opts.model.folder + '/api.jsonic') : undefined,
+        meta: {
+            name: 'foo'
+        },
+        entity: opts.model ? opts.model.entity : undefined,
+    };
+    await apidef.watch(spec);
+    return async function build(model, build) {
+        // TODO: voxgig model needs to handle errors from here
         return sdkgen.generate({ model, build, root });
     };
 };

package/dist/sdkgen.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdkgen.js","sourceRoot":"","sources":["../src/sdkgen.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;;;;;;;;;;;;;;;;;;;;AA0DlD,wBAAM;AAxDR,4CAA6B;AAE7B,uCAAmC;AAWnC,SAAS,MAAM,CAAC,IAAmB;IACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;IACxB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,CAAA;IACjC,MAAM,QAAQ,GAAG,IAAA,mBAAQ,GAAE,CAAA;IAE3B,8DAA8D;IAE9D,SAAS,QAAQ,CAAC,IAAS;QACzB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAE5B,QAAQ,CAAC,QAAQ,CACf,EAAE,EAAE,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CACtB,CAAA;IACH,CAAC;IAED,OAAO;QACL,QAAQ;QAER,aAAa;QAEb,8BAA8B;KAC/B,CAAA;AAEH,CAAC;AAGD,MAAM,CAAC,SAAS,GAAG,UAAS,IAAS,EAAE,IAAmB;IACxD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAE3B,OAAO,SAAS,KAAK,CAAC,KAAU,EAAE,KAAU;QAC1C,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAChD,CAAC,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"sdkgen.js","sourceRoot":"","sources":["../src/sdkgen.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;;;;;;;;;;;;;;;;;;;;AAsGlD,wBAAM;AApGR,4CAA6B;AAE7B,uCAAmC;AAEnC,2CAAuC;AAGvC,uDAAkD;AAelD,SAAS,MAAM,CAAC,IAAmB;IACjC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;IACxB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,CAAA;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,SAAS,CAAA;IACjC,MAAM,QAAQ,GAAG,IAAA,mBAAQ,GAAE,CAAA;IAE3B,8DAA8D;IAE9D,KAAK,UAAU,QAAQ,CAAC,IAAS;QAC/B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QAE5B;;;;UAIE;QAEF,IAAI,CAAC;YACH,QAAQ,CAAC,QAAQ,CACf,EAAE,EAAE,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CACtB,CAAA;QACH,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAA;YAClC,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAGD,KAAK,UAAU,OAAO,CAAC,IAAS,EAAE,GAAQ;QACxC,OAAO,MAAM,IAAA,gCAAc,EAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACxC,CAAC;IAGD,OAAO;QACL,QAAQ;QAER,aAAa;QAEb,8BAA8B;KAC/B,CAAA;AAEH,CAAC;AAGD,MAAM,CAAC,SAAS,GAAG,KAAK,WAAU,IAAS,EAAE,IAAmB;IAC9D,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAE3B,MAAM,MAAM,GAAG,IAAA,eAAM,GAAE,CAAA;IAEvB,MAAM,IAAI,GAAG;QACX,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS;QACnE,IAAI,EAAE;YACJ,IAAI,EAAE,KAAK;SACZ;QACD,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;KACnD,CAAA;IAED,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAExB,OAAO,KAAK,UAAU,KAAK,CAAC,KAAU,EAAE,KAAU;QAChD,sDAAsD;QACtD,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAChD,CAAC,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "0.0.7",
+  "version": "0.1.0",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "types": "dist/sdkgen.d.ts",
@@ -34,13 +34,17 @@
   ],
   "devDependencies": {
     "@hapi/code": "^9.0.3",
-    "@types/node": "22.3.0",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "22.5.0",
     "aontu": "^0.21.1",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.23.1",
+    "json-schema-to-ts": "^3.1.0",
     "memfs": "^4.11.1",
     "typescript": "^5.5.4"
   },
   "dependencies": {
-    "jostraca": "^0.1.6"
+    "@redocly/openapi-core": "^1.21.0",
+    "@voxgig/apidef": "^0.0.3",
+    "jostraca": "^0.2.1"
   }
 }

package/src/prepare-openapi.ts

@@ -0,0 +1,59 @@
+
+import * as Fs from 'node:fs'
+
+import { each } from 'jostraca'
+
+import { bundleFromString, createConfig } from '@redocly/openapi-core'
+
+
+async function PrepareOpenAPI(inspec: any, ctx: any) {
+
+  // TODO: avoid rebuilding if unchanged
+
+  // const source = Fs.readFileSync(ctx.def, 'utf8')
+
+  // const config = await createConfig({})
+  // const bundle = await bundleFromString({
+  //   source,
+  //   config,
+  //   dereference: true,
+  // })
+
+  // // console.log('BUNDLE', bundle)
+
+  // Fs.writeFileSync(
+  //   ctx.folder + '/../model/def.jsonic',
+  //   JSON.stringify(bundle.bundle.parsed, null, 2)
+  // )
+
+
+  // const spec: any = {}
+
+  // spec.main = {
+  //   sdk: {
+  //     api: {
+  //       // cmap
+  //       /*
+  //               path: each(bundle.bundle.parsed.paths, (path: any) => ({
+  //                 param: {}
+  //                 }))
+  //                 */
+  //     }
+  //   }
+  // }
+
+
+  // Fs.writeFileSync(
+  //   ctx.folder + '/../model/spec.jsonic',
+  //   JSON.stringify(spec, null, 2)
+  // )
+
+
+  return false
+}
+
+
+
+export {
+  PrepareOpenAPI
+}

package/src/sdkgen.ts

@@ -4,31 +4,59 @@ import * as Fs from 'node:fs'
 
 import { Jostraca } from 'jostraca'
 
+import { ApiDef } from '@voxgig/apidef'
+
+
+import { PrepareOpenAPI } from './prepare-openapi'
+
 
 type SdkGenOptions = {
   folder: string
+  def?: string
   fs: any
+  model?: {
+    folder: string
+    entity: any
+  }
 }
 
 
 
-
 function SdkGen(opts: SdkGenOptions) {
   const fs = opts.fs || Fs
   const folder = opts.folder || '.'
+  const def = opts.def || 'def.yml'
   const jostraca = Jostraca()
 
   // const { cmp, each, Project, Folder, File, Code } = jostraca
 
-  function generate(spec: any) {
+  async function generate(spec: any) {
     const { model, root } = spec
 
-    jostraca.generate(
-      { fs, folder },
-      () => root({ model })
-    )
+    /*
+    if (await prepare(spec, { fs, folder, def })) {
+      return
+    }
+    */
+
+    try {
+      jostraca.generate(
+        { fs, folder },
+        () => root({ model })
+      )
+    }
+    catch (err: any) {
+      console.log('SDKGEN ERROR: ', err)
+      throw err
+    }
   }
 
+
+  async function prepare(spec: any, ctx: any) {
+    return await PrepareOpenAPI(spec, ctx)
+  }
+
+
   return {
     generate,
 
@@ -40,10 +68,26 @@ function SdkGen(opts: SdkGenOptions) {
 }
 
 
-SdkGen.makeBuild = function(root: any, opts: SdkGenOptions) {
+SdkGen.makeBuild = async function(root: any, opts: SdkGenOptions) {
+  console.log('SDKGEN makeBuild')
   const sdkgen = SdkGen(opts)
 
-  return function build(model: any, build: any) {
+  const apidef = ApiDef()
+
+  const spec = {
+    def: opts.def,
+    kind: 'openapi-3',
+    model: opts.model ? (opts.model.folder + '/api.jsonic') : undefined,
+    meta: {
+      name: 'foo'
+    },
+    entity: opts.model ? opts.model.entity : undefined,
+  }
+
+  await apidef.watch(spec)
+
+  return async function build(model: any, build: any) {
+    // TODO: voxgig model needs to handle errors from here
     return sdkgen.generate({ model, build, root })
   }
 }