functionalscript 0.0.233 → 0.0.237

package/.github/workflows/npm-publish.yml

@@ -30,7 +30,7 @@ jobs:
           node-version: 14
           registry-url: https://registry.npmjs.org/
       - run: npm ci
-      - run: node ./version
+      - run: node ./io/nodejs/version
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/commonjs/package/dependencies/index.js

@@ -0,0 +1,61 @@
+const { todo } = require('../../../dev')
+const json = require('../../../json')
+const { isObject } = json
+const seq = require('../../../types/sequence')
+const path = require('../../path')
+const { at } = require('../../../types/object')
+
+/** @typedef {readonly[string, string]} DependencyJson */
+
+/** @typedef {{readonly[k in string]: string}} DependencyMapJson */
+
+/** @typedef {DependencyMapJson|undefined} DependenciesJson */
+
+/** @type {(entry: json.Entry) => boolean} */
+const isDependencyJson = ([, v]) => typeof v === 'string'
+
+/** @type {(j: json.Unknown|undefined) => j is DependenciesJson} */
+const isDependenciesJson = j => {
+    if (j === undefined) { return true }
+    if (!json.isObject(j)) { return false }
+    return seq.every(seq.map(isDependencyJson)(Object.entries(j)))
+}
+
+/** @typedef {readonly[string, seq.Sequence<string>]} IdPath */
+
+/** @type {(prior: readonly[string|undefined, seq.Sequence<string>]) => seq.Thunk<IdPath>} */
+const variants = prior => () => {
+    const [a, b] = prior
+    const r = seq.next(b)
+    if (r === undefined) { return undefined }
+    const { first, tail } = r
+    /** @type {IdPath} */
+    const n = [a === undefined ? first : `${a}/${first}`, tail]
+    return { first: n, tail: variants(n) }
+}
+
+/** @type {(d: DependencyMapJson) => (p: IdPath) => IdPath|undefined} */
+const mapDependency = d => ([external, internal]) => {
+    const id = at(external)(d)
+    if (id === undefined) { return undefined }
+    return [id, internal]
+}
+
+/** @typedef {readonly[string, string]} GlobalPath */
+
+/** @type {(d: DependenciesJson) => (p: path.Items) => GlobalPath|undefined} */
+const idPath = d => p => {
+    if (d === undefined) { return undefined }
+    const v = variants([undefined, p])
+    const valid = seq.first(undefined)(seq.filterMap(mapDependency(d))(v))
+    if (valid === undefined) { return undefined }
+    const [packId, localId] = valid
+    return [packId, seq.join('/')(localId)]
+}
+
+module.exports = {
+    /** @readonly */
+    isDependenciesJson,
+    /** @readonly */
+    idPath,
+}

package/commonjs/package/dependencies/test.js

@@ -0,0 +1,37 @@
+const _ = require('.')
+const json = require('../../../json')
+const { sort } = require('../../../types/object')
+const seq = require('../../../types/sequence')
+
+{
+    if (!_.isDependenciesJson(undefined)) { throw 'error' }
+    if (_.isDependenciesJson(null)) { throw 'error' }
+    if (!_.isDependenciesJson({})) { throw 'error' }
+    if (!_.isDependenciesJson({'a':'b'})) { throw 'error' }
+    if (_.isDependenciesJson({ 'a': 12 })) { throw 'error' }
+}
+
+/** @type {(g: _.GlobalPath|undefined) => string} */
+const stringify = g => {
+    if (g === undefined) { throw g }
+    return json.stringify(sort)(g)
+}
+
+{
+    if (_.idPath(undefined)(['a', 'b']) !== undefined) { throw 'error' }
+    if (_.idPath({})(['b']) !== undefined) { throw 'error' }
+    if (_.idPath({b:'x'})(['d']) !== undefined) { throw 'error'}
+    {
+        const result = stringify(_.idPath({ b: 'x' })(['b']))
+        if (result !== '["x",""]') { throw result }
+    }
+    if (_.idPath({ 'b/r': 'x' })(['b']) !== undefined) { throw 'error'}
+    {
+        const result = stringify(_.idPath({ 'b/r': 'x' })(['b', 'r']))
+        if (result !== '["x",""]') { throw result }
+    }
+    {
+        const result = stringify(_.idPath({ 'b/r': 'x' })(['b', 'r', 'd', 't']))
+        if (result !== '["x","d/t"]') { throw result }
+    }
+}

package/commonjs/package/index.js

@@ -1,72 +1,28 @@
-const { todo } = require('../../dev')
 const json = require('../../json')
-const { isObject } = json
-const seq = require('../../types/sequence')
-const { split } = require('../path')
-const map = require('../../types/map')
-
-/** @typedef {(directoryName: string) => undefined|string|Directory} Directory */
-
-const empty = () => undefined
+const dep = require('./dependencies')
 
 /** 
  * @typedef {{
- *  readonly get: (dir: string) => Item|undefined
- *  readonly set: (dir: string) => (item: Item) => Map
- * }} Map
+ *  readonly version: string
+ *  readonly dependencies?: dep.DependenciesJson
+ * }} PackageJson 
  */
 
-/** @typedef {Map|string} Item */
-
-/** @typedef {readonly[string, Map]} Pair */
-
-/** @type {(prior: seq.Sequence<Pair>) => (dir: string) => seq.Sequence<Pair>} */
-const get = prior => dir => {
-    const result = seq.next(prior)
-    if (result === undefined) { throw 'panic' }
-    const { first: [,m] } = result
-    const child = m.get(dir)
-    const childMap = child === undefined || typeof child === 'string' ? map.empty : child
-    /** @type {Pair} */
-    const pair = [dir, childMap]
-    return seq.sequence(pair)(prior)
-}
-
-/** @typedef {readonly[string, Item]} Result */
-
-/** @type {(a: Result) => (b: Pair) => Result} */
-const set = ([aDir, item]) => ([bDir, bMap]) => [bDir, bMap.set(aDir)(item)]
-
-/** @type {(prior: Map) => (entry: json.Entry) => Map} */
-const addDirectory = prior => ([directory, id]) => {
-    if (typeof id !== 'string') { return prior }
-    const path = split(directory)
-    const rev = seq.reduce(get)([['', prior]])(path)
-    const result = seq.next(rev)
-    if (result === undefined) { throw 'panic' }
-    const { first: [dir], tail } = result
-    const [, m] = seq.reduce(set)([dir, id])(tail)
-    if (typeof m === 'string') { return prior }
-    return m
-}
-
-/** @type {(m: Map) => Directory} */
-const func = m => dir => {
-    const r = m.get(dir)
-    if (typeof r !== 'object') { return r }
-    return func(r)
+/** @type {(j: json.Unknown) => j is PackageJson} */
+const isPackageJson = j => {
+    if (!json.isObject(j)) { return false }
+    if (typeof j.version !== 'string') { return false }
+    if (!dep.isDependenciesJson(j.dependencies)) { return false }
+    return true
 }
 
-/** @type {(packageJson: json.Unknown) => Directory} */
-const dependencies = packageJson => {
-    if (!isObject(packageJson)) { return empty }
-    const dependencies = packageJson['dependencies']
-    if (dependencies === undefined || !isObject(dependencies)) { return empty }
-    const result = seq.reduce(addDirectory)(map.empty)(Object.entries(dependencies))
-    return func(result)
-}
+/**
+ * @typedef {{
+ *  readonly dependencies: dep.DependenciesJson
+ * }} Package
+ */
 
 module.exports = {
     /** @readonly */
-    dependencies,
-}
+    isPackageJson,
+}

package/commonjs/package/test.js

@@ -1,33 +1,16 @@
 const _ = require('.')
 
-{
-    const packageJson = { dependencies: {} }
-    const dir = _.dependencies(packageJson)
-    const r = dir('x')
-    if (r !== undefined) { throw r }
-}
+require('./dependencies/test')
 
 {
-    const packageJson = { dependencies: { 'x': 'e' } }
-    const dir = _.dependencies(packageJson)
-    const r = dir('x')
-    if (r !== 'e') { throw r }
+    if (_.isPackageJson(null)) { throw 'error' }
+    if (_.isPackageJson({})) { throw 'error' }
+    if (_.isPackageJson({version:12})) { throw 'error' }
+    if (!_.isPackageJson({version:"12"})) { throw 'error' }
+    if (_.isPackageJson({version:"",dependencies:[]})) { throw 'error' }
+    if (!_.isPackageJson({ version: "", dependencies: {} })) { throw 'error' }
+    if (_.isPackageJson({ version: "", dependencies: { x: 12} })) { throw 'error' }
+    if (!_.isPackageJson({ version: "", dependencies: { x: "12" } })) { throw 'error' }
 }
 
-{
-    const packageJson = { 
-        dependencies: { 
-            'x/a': 'xa',
-            'x/b': 'xb'
-        } 
-    }
-    const dir = _.dependencies(packageJson)
-    const x = dir('x')
-    if (typeof x !== 'function') { throw x }
-    const xa = x('a')
-    if (xa !== 'xa') { throw xa }
-    const xb = x('b')
-    if (xb !== 'xb') { throw xb }
-    const xc = x('c')
-    if (xc !== undefined) { throw xc }
-}
+module.exports = {}

package/io/nodejs/version/index.js

@@ -0,0 +1,20 @@
+const cp = require('child_process')
+const fs = require('fs')
+const json = require('../../../json')
+const { isPackageJson } = require('../../../commonjs/package')
+
+const b =cp.execSync('git log --oneline')
+
+const r = b.toString().split('\n').length
+
+const v = `0.0.${r}`
+
+console.log(`version: ${v}`)
+
+const package_json = json.parse(fs.readFileSync('package.json').toString())
+
+if (!isPackageJson(package_json)) { throw 'error' }
+
+const x = { ...package_json, version: v }
+
+fs.writeFileSync('package.json', JSON.stringify(x, null, 2))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.233",
+  "version": "0.0.237",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -5,6 +5,7 @@ require('./types/btree/test')
 require('./json/test')
 require('./types/object/test')
 require('./io/commonjs/test')
+require('./commonjs/package/dependencies/test')
 require('./commonjs/package/test')
 
 /** @type {() => never} */

package/version.js

@@ -1,17 +0,0 @@
-const cp = require('child_process')
-const fs = require('fs')
-const json = require('./json')
-
-const b =cp.execSync('git log --oneline')
-
-const r = b.toString().split('\n').length
-
-const v = `0.0.${r}`
-
-console.log(`version: ${v}`)
-
-let package_json = json.parse(fs.readFileSync('package.json').toString())
-
-package_json = json.setProperty(v)(['version'])(package_json)
-
-fs.writeFileSync('package.json', JSON.stringify(package_json, null, 2))