@voxgig/model 1.5.0 → 2.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 voxgig
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/model.d.ts

@@ -1,7 +1,7 @@
 import { Config } from './lib/config';
 import { BuildResult, Spec } from './lib/build';
 import { Watch } from './lib/watch';
-import { dive, joins, get, pinify, camelify } from './lib/util';
+import { dive, joins, get, pinify, camelify } from '@voxgig/util';
 declare class Model {
     config: Config;
     build: any;

package/dist/model.js

@@ -11,7 +11,7 @@ const config_1 = require("./lib/config");
 const watch_1 = require("./lib/watch");
 const model_1 = require("./lib/builder/model");
 const local_1 = require("./lib/builder/local");
-const util_1 = require("./lib/util");
+const util_1 = require("@voxgig/util");
 Object.defineProperty(exports, "dive", { enumerable: true, get: function () { return util_1.dive; } });
 Object.defineProperty(exports, "joins", { enumerable: true, get: function () { return util_1.joins; } });
 Object.defineProperty(exports, "get", { enumerable: true, get: function () { return util_1.get; } });

package/dist/model.js.map

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

package/model.ts

@@ -16,7 +16,7 @@ import {
   get,
   pinify,
   camelify,
-} from './lib/util'
+} from '@voxgig/util'
 
 
 const intern = makeIntern()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/model",
-  "version": "1.5.0",
+  "version": "2.0.1",
   "main": "dist/model.js",
   "type": "commonjs",
   "types": "dist/model.d.ts",
@@ -44,16 +44,17 @@
     "LICENSE"
   ],
   "dependencies": {
+    "@voxgig/util": "^0.0.1",
     "aontu": "0.21.1",
     "chokidar": "3.6.0"
   },
   "devDependencies": {
-    "@types/node": "20.14.2",
     "@types/jest": "^29.5.12",
-    "esbuild": "^0.21.5",
+    "@types/node": "20.14.10",
+    "es-jest": "^2.1.0",
+    "esbuild": "^0.23.0",
     "esbuild-jest": "^0.5.0",
     "jest": "^29.7.0",
-    "es-jest": "^2.1.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.3"
   }
 }

package/lib/util.ts

@@ -1,119 +0,0 @@
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
-
-
-type DiveMapper = (path: any[], leaf: any) => any[]
-
-function dive(node: any, depth?: number | DiveMapper, mapper?: DiveMapper): any[] {
-  let d = (null == depth || 'number' != typeof depth) ? 2 : depth
-  mapper = 'function' === typeof depth ? depth : mapper
-
-  let items: any[] = []
-
-  Object.entries(node || {}).reduce(
-    (items: any[], entry: any[]) => {
-      let key = entry[0]
-      let child = entry[1]
-
-      // console.log('CHILD', d, key, child)
-
-      if ('$' === key) {
-        // console.log('BBB', d)
-        items.push([[], child])
-      }
-      else if (
-        d <= 1 ||
-        null == child ||
-        'object' !== typeof child ||
-        0 === Object.keys(child).length
-      ) {
-        // console.log('AAA', d)
-        items.push([[key], child])
-      }
-      else {
-        // console.log('CCC', d)
-        let children = dive(child, d - 1)
-        children = children.map(child => {
-          child[0].unshift(key)
-          return child
-        })
-        items.push(...children)
-      }
-
-      return items
-    },
-    items
-  )
-
-  // console.log('ITEMS', items)
-
-  if (mapper) {
-    return items.reduce(((a, entry) => {
-      entry = (mapper as any)(entry[0], entry[1])
-      if (null != entry[0]) {
-        a[entry[0]] = entry[1]
-      }
-      return a
-    }), {} as any)
-  }
-
-  return items
-}
-
-
-/*
- * , => a,b
- * :, => a:1,b:2
- * :,/ => a:1,b:2/c:3,d:4/e:5,f:6
-*/
-function joins(arr: any[], ...seps: string[]) {
-  arr = arr || []
-  seps = seps || []
-  let sa = []
-  for (let i = 0; i < arr.length; i++) {
-    sa.push(arr[i])
-    if (i < arr.length - 1) {
-      for (let j = seps.length - 1; -1 < j; j--) {
-        if (0 === (i + 1) % (1 << j)) {
-          sa.push(seps[j])
-          break
-        }
-      }
-    }
-  }
-  return sa.join('')
-}
-
-
-function get(root: any, path: string | string[]): any {
-  path = 'string' === typeof path ? path.split('.') : path
-  let node = root
-  for (let i = 0; i < path.length && null != node; i++) {
-    node = node[path[i]]
-  }
-  return node
-}
-
-
-function pinify(path: string[]) {
-  let pin = path
-    .map((p: string, i: number) =>
-      p + (i % 2 ? (i === path.length - 1 ? '' : ',') : ':'))
-    .join('')
-  return pin
-}
-
-
-function camelify(input: any[] | string) {
-  let parts = 'string' == typeof input ? input.split('-') : input.map(n => '' + n)
-  return parts
-    .map((p: string) => ('' === p ? '' : (p[0].toUpperCase() + p.substring(1))))
-    .join('')
-}
-
-export {
-  dive,
-  joins,
-  get,
-  pinify,
-  camelify,
-}