@voxgig/apidef 1.1.1 → 1.2.0

package/dist/transform.d.ts

@@ -1,7 +1,7 @@
 type TransformCtx = {
     log: any;
     spec: any;
-    guide: any;
+    model: any;
     opts: any;
     util: any;
     defpath: string;
@@ -12,15 +12,17 @@ type TransformSpec = {
 type TransformResult = {
     ok: boolean;
     msg: string;
+    err?: any;
+    transform?: any;
 };
-type Transform = (ctx: TransformCtx, tspec: TransformSpec, model: any, def: any) => Promise<TransformResult>;
+type Transform = (ctx: TransformCtx, tspec: TransformSpec, apimodel: any, def: any) => Promise<TransformResult>;
 type ProcessResult = {
     ok: boolean;
     msg: string;
     results: TransformResult[];
 };
 declare function resolveTransforms(ctx: TransformCtx): Promise<TransformSpec>;
-declare function processTransforms(ctx: TransformCtx, spec: TransformSpec, model: any, def: any): Promise<ProcessResult>;
+declare function processTransforms(ctx: TransformCtx, spec: TransformSpec, apimodel: any, def: any): Promise<ProcessResult>;
 declare function fixName(base: any, name: string, prop?: string): void;
 export type { TransformCtx, TransformSpec, };
 export { fixName, resolveTransforms, processTransforms, };

package/dist/transform.js

@@ -22,7 +22,8 @@ const TRANSFORM = {
     manual: manual_1.manualTransform,
 };
 async function resolveTransforms(ctx) {
-    const { log, guide: { guide } } = ctx;
+    const { log, model: { main: { guide } } } = ctx;
+    // console.dir(api, { depth: null })
     const tspec = {
         transform: []
     };
@@ -32,18 +33,23 @@ async function resolveTransforms(ctx) {
         .split(/\s*,\s*/)
         .map((t) => t.trim())
         .filter((t) => '' != t);
-    log.info({ point: 'transform', note: 'order', order: transformNames });
+    log.info({
+        point: 'transform', note: 'order: ' + transformNames.join(';'),
+        order: transformNames
+    });
     for (const tn of transformNames) {
-        log.debug({ what: 'transform', transform: tn });
+        log.debug({ what: 'transform', transform: tn, note: tn });
         const transform = await resolveTransform(tn, ctx);
         tspec.transform.push(transform);
     }
+    // console.log('TSPEC', tspec)
     return tspec;
 }
 async function resolveTransform(tn, ctx) {
-    const { log, defpath, guide: { guide } } = ctx;
+    const { log, defpath, model: { guide } } = ctx;
     let transform = TRANSFORM[tn];
     if (transform) {
+        // console.log('resolveTransform', tn, transform)
         return transform;
     }
     const tdef = guide.transform[tn];
@@ -70,7 +76,7 @@ async function resolveTransform(tn, ctx) {
     }
     return transform;
 }
-async function processTransforms(ctx, spec, model, def) {
+async function processTransforms(ctx, spec, apimodel, def) {
     const pres = {
         ok: true,
         msg: '',
@@ -79,17 +85,18 @@ async function processTransforms(ctx, spec, model, def) {
     for (let tI = 0; tI < spec.transform.length; tI++) {
         const transform = spec.transform[tI];
         try {
-            const tres = await transform(ctx, spec, model, def);
+            const tres = await transform(ctx, spec, apimodel, def);
             pres.ok = pres.ok && tres.ok;
-            pres.msg += tres.msg + '\n';
             pres.results.push(tres);
         }
         catch (err) {
             pres.ok = false;
-            pres.msg += err.message + '\n';
+            pres.msg += transform.name + ': ' + err.message + '\n';
             pres.results.push({
                 ok: false,
-                msg: err.message
+                msg: err.message,
+                err,
+                transform
             });
         }
     }

package/dist/transform.js.map

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

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/apidef.ts","../src/transform.ts","../src/transform/entity.ts","../src/transform/field.ts","../src/transform/manual.ts","../src/transform/operation.ts","../src/transform/top.ts"],"version":"5.6.3"}
+{"root":["../src/apidef.ts","../src/transform.ts","../src/transform/entity.ts","../src/transform/field.ts","../src/transform/manual.ts","../src/transform/operation.ts","../src/transform/top.ts"],"version":"5.7.2"}

package/model/apidef.jsonic

@@ -0,0 +1,41 @@
+
+main: guide: control: transform: &: {
+  order: string
+}
+
+main: guide: control: transform: openapi: {
+  order: *`
+
+  top,
+  entity,
+  operation,
+  field,
+  manual,
+  
+  ` | string
+}
+
+
+main: guide: transform: &: {
+  name: .$KEY
+  load: string
+}
+
+main: guide: transform: {
+  top: {}
+  entity: {}
+  operation: {}
+  field: {}
+  manual: {}
+}
+
+
+main: guide: entity: &: {
+  name: .$KEY
+  path: &: {
+    op: {}
+  }
+}
+
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/apidef",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "main": "dist/apidef.js",
   "type": "commonjs",
   "types": "dist/apidef.d.ts",
@@ -41,19 +41,19 @@
   "devDependencies": {
     "@hapi/code": "^9.0.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "22.9.0",
-    "aontu": "^0.25.1",
+    "@types/node": "22.10.0",
+    "aontu": "^0.25.3",
     "esbuild": "^0.24.0",
     "json-schema-to-ts": "^3.1.1",
     "memfs": "^4.14.0",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^1.25.11",
-    "@voxgig/util": "^0.0.5",
+    "@redocly/openapi-core": "^1.25.14",
+    "@voxgig/util": "^0.0.7",
     "chokidar": "^4.0.1",
     "gubu": "^8.3.0",
-    "jostraca": "^0.8.0",
+    "jostraca": "^0.10.1",
     "pino": "^9.5.0",
     "pino-pretty": "^13.0.0",
     "sonic-boom": "^4.2.0"

package/src/apidef.ts

@@ -2,7 +2,7 @@
 
 import * as Fs from 'node:fs'
 import Path from 'node:path'
-
+import { inspect } from 'node:util'
 
 import { bundleFromString, createConfig } from '@redocly/openapi-core'
 import { FSWatcher } from 'chokidar'
@@ -19,88 +19,60 @@ import {
 
 
 type ApiDefOptions = {
+  def?: string
   fs?: any
   pino?: ReturnType<typeof Pino>
   debug?: boolean | string
+  folder?: string
+  meta?: Record<string, any>
 }
 
 
-type ApiDefSpec = {
-  def: string
-  model: string,
-  kind: string,
-  meta: Record<string, any>,
-  guide?: any
-}
 
 
-function ApiDef(opts: ApiDefOptions = {}) {
+function ApiDef(opts: ApiDefOptions) {
   const fs = opts.fs || Fs
   const pino = prettyPino('apidef', opts)
 
   const log = pino.child({ cmp: 'apidef' })
 
 
-  async function watch(spec: ApiDefSpec) {
-    log.info({ point: 'watch-start' })
-    log.debug({ point: 'watch-spec', spec })
-
-    await generate(spec)
-
-    const fsw = new FSWatcher()
-
-    fsw.on('change', (...args: any[]) => {
-      log.trace({ watch: 'change', file: args[0] })
-      generate(spec)
-    })
-
-    log.trace({ watch: 'add', what: 'def', file: spec.def })
-    fsw.add(spec.def)
-
-    log.trace({ watch: 'add', what: 'guide', file: spec.guide })
-    fsw.add(spec.guide)
-  }
-
-
-  async function generate(spec: ApiDefSpec) {
+  async function generate(spec: any) {
     const start = Date.now()
 
-    // TODO: validate spec
+    const buildspec = spec.build.spec
 
-    const defpath = Path.normalize(spec.def)
+    let defpath = spec.model.def
 
-    log.info({ point: 'generate-start', note: 'defpath', defpath, start })
-    log.debug({ point: 'generate-spec', spec })
+    // TOOD: defpath should be independently defined
+    defpath = Path.join(buildspec.base, '..', 'def', defpath)
+
+    log.info({
+      point: 'generate-start',
+      note: defpath.replace(process.cwd(), '.'), defpath, start
+    })
 
     // TODO: Validate spec
     const ctx = {
       log,
       spec,
-      guide: {},
       opts,
       util: { fixName },
-      defpath: Path.dirname(defpath)
-    }
-
-
-
-    const guide = await resolveGuide(spec, opts)
-
-    if (null == guide) {
-      return
+      defpath: Path.dirname(defpath),
+      model: spec.model
     }
 
-
-    log.debug({ point: 'guide', guide })
-
-    ctx.guide = guide
     const transformSpec = await resolveTransforms(ctx)
-    log.debug({ point: 'transform', spec: transformSpec })
+
+    log.debug({
+      point: 'transform', spec: transformSpec,
+      note: log.levelVal <= 20 ? inspect(transformSpec) : ''
+    })
 
 
     let source
     try {
-      source = fs.readFileSync(spec.def, 'utf8')
+      source = fs.readFileSync(defpath, 'utf8')
     }
     catch (err: any) {
       log.error({ read: 'fail', what: 'def', file: defpath, err })
@@ -124,7 +96,7 @@ function ApiDef(opts: ApiDefOptions = {}) {
     }
 
 
-    const model = {
+    const apimodel = {
       main: {
         api: {
           entity: {}
@@ -133,36 +105,39 @@ function ApiDef(opts: ApiDefOptions = {}) {
       },
     }
 
-    try {
-      const def = bundle.bundle.parsed
-      const processResult = await processTransforms(ctx, transformSpec, model, def)
+    const def = bundle.bundle.parsed
+    const processResult = await processTransforms(ctx, transformSpec, apimodel, def)
 
-      if (!processResult.ok) {
-        log.error({ process: 'fail', what: 'transform', result: processResult })
-        throw new Error('Transform failed: ' + processResult.msg)
-      }
-      else {
-        log.debug({ process: 'result', what: 'transform', result: processResult })
-      }
-    }
-    catch (err: any) {
-      log.error({ process: 'fail', what: 'transform', err })
-      throw err
+    if (!processResult.ok) {
+      log.error({
+        fail: 'process', point: 'transform-result',
+        result: processResult, note: processResult.msg,
+        err: processResult.results[0]?.err
+      })
+
+      return { ok: false, processResult }
     }
 
-    const modelapi = { main: { api: model.main.api } }
+    const modelapi = { main: { api: apimodel.main.api } }
     let modelSrc = JSON.stringify(modelapi, null, 2)
-    modelSrc = modelSrc.substring(1, modelSrc.length - 1)
 
-    writeChanged('api-model', spec.model, modelSrc)
+    modelSrc =
+      '# GENERATED FILE - DO NOT EDIT\n\n' +
+      modelSrc.substring(1, modelSrc.length - 1).replace(/\n  /g, '\n')
 
+    const modelPath = Path.normalize(spec.config.model)
+    // console.log('modelPath', modelPath)
+    writeChanged('api-model', modelPath, modelSrc)
 
-    const modelBasePath = Path.dirname(spec.model)
-    const defFilePath = Path.join(modelBasePath, 'def.jsonic')
+    const modelBasePath = Path.dirname(modelPath)
+    const defFilePath = Path.join(modelBasePath, 'def-generated.jsonic')
 
-    const modelDef = { main: { def: model.main.def } }
+    const modelDef = { main: { def: apimodel.main.def } }
     let modelDefSrc = JSON.stringify(modelDef, null, 2)
-    modelDefSrc = modelDefSrc.substring(1, modelDefSrc.length - 1)
+
+    modelDefSrc =
+      '# GENERATED FILE - DO NOT EDIT\n\n' +
+      modelDefSrc.substring(1, modelDefSrc.length - 1).replace(/\n  /g, '\n')
 
     writeChanged('def-model', defFilePath, modelDefSrc)
 
@@ -170,13 +145,12 @@ function ApiDef(opts: ApiDefOptions = {}) {
 
     return {
       ok: true,
-      model,
+      apimodel,
     }
   }
 
 
-
-  function writeChanged(what: string, path: string, content: string) {
+  function writeChanged(point: string, path: string, content: string) {
     let exists = false
     let changed = false
     let action = ''
@@ -193,10 +167,12 @@ function ApiDef(opts: ApiDefOptions = {}) {
 
       changed = existingContent !== content
 
+      // console.log('WC', changed, path, existingContent, content)
+
       log.info({
-        point: 'write-' + what,
-        note: 'changed,file',
-        write: 'file', what, skip: !changed, exists, changed,
+        point: 'write-' + point,
+        note: (changed ? '' : 'not-') + 'changed ' + path,
+        write: 'file', skip: !changed, exists, changed,
         contentLength: content.length, file: path
       })
 
@@ -207,116 +183,150 @@ function ApiDef(opts: ApiDefOptions = {}) {
     }
     catch (err: any) {
       log.error({
-        fail: action, what, file: path, exists, changed,
+        fail: action, point, file: path, exists, changed,
         contentLength: content.length, err
       })
+      err.__logged__ = true
       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')
+  /*
+    async function resolveGuide(spec: any, _opts: any) {
+      if (null == spec.guide) {
+        spec.guide = spec.def + '-guide.jsonic'
       }
-      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
+  
+      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 {
-          err.rooterrs$ = root.err
-          throw err
+          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
     }
+  */
 
-    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
-    }
+  return {
+    // watch,
+    generate,
+  }
+}
 
-    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)
+ApiDef.makeBuild = async function(opts: ApiDefOptions) {
+  let apidef: any = undefined
 
-    return guide
+  const config = {
+    def: opts.def || 'no-def',
+    kind: 'openapi3',
+    model: opts.folder ? (opts.folder + '/api-generated.jsonic') : 'no-model',
+    meta: opts.meta || {},
   }
 
+  const build = async function(model: any, build: any, ctx: any) {
+    // console.log('APIDEF build')
+    // console.dir(ctx, { depth: null })
+    // console.dir(build, { depth: null })
 
-  return {
-    watch,
-    generate,
+
+    if (null == apidef) {
+      apidef = ApiDef({
+        ...opts,
+        pino: build.log,
+      })
+    }
+
+    await apidef.generate({ model, build, config })
   }
+
+  build.step = 'pre'
+
+  return build
 }
 
 
@@ -324,7 +334,7 @@ guide: control: transform: openapi: order: \`
 
 export type {
   ApiDefOptions,
-  ApiDefSpec,
+  // ApiDefSpec,
 }
 
 

package/src/transform/entity.ts

@@ -9,9 +9,11 @@ import { fixName } from '../transform'
 
 
 async function entityTransform(ctx: TransformCtx, tspec: TransformSpec, model: any, def: any) {
-  const { guide: { guide } } = ctx
+  const { model: { main: { guide } } } = ctx
   let msg = ''
 
+  // console.log('DEF', def)
+
   each(guide.entity, (guideEntity: any) => {
 
     const entityModel: any = model.main.api.entity[guideEntity.key$] = {

package/src/transform/field.ts

@@ -14,7 +14,7 @@ async function fieldTransform(
   model: any,
   def: any
 ) {
-  const { guide: { guide } } = ctx
+  const { model: { main: { guide } } } = ctx
   let msg = 'fields: '
 
   each(guide.entity, (guideEntity: any) => {