functionalscript 0.0.355 → 0.0.356

package/commonjs/path/README.md

@@ -0,0 +1,17 @@
+# Path
+
+## Simplified Common.js
+
+A path should be disambiguous.
+
+Path limitations:
+
+- Accepted file extensions: `.f.js`, `.json`.
+- A file path should be fully specified.  For example `../package/dependencies/test.f.js`.
+- A package name can't contain `/`. For example 
+  - `functionalscript/main.f.js` is allowed.
+  - `functionalscript/functionalscript/main.f.js` is not allowed.
+
+`package.json` limitations:
+
+- Only GitHub packages can be referenced. In the future, we may add generic Git repositories.

package/commonjs/path/main.f.js

@@ -98,11 +98,15 @@ const mapDependency = d => ([external, internal]) => {
  *  (items: list.List<string>) =>
  *  Path|undefined}
  */
-const parseGlobal = d => dir => items => {
-    const v = variants([undefined, items])
-    const r = list.first(undefined)(list.filterMap(mapDependency(d))(v))
-    if (r === undefined) { return undefined }
-    return { package: r[0], items: list.toArray(r[1]), dir }
+const parseGlobal = dependencies => 
+{
+    const filterMap = list.filterMap(mapDependency(dependencies))
+    return dir => items => {
+        const v = variants([undefined, items])
+        const r = list.first(undefined)(filterMap(v))
+        if (r === undefined) { return undefined }
+        return { package: r[0], items: list.toArray(r[1]), dir }
+    }
 }
 
 /**
@@ -112,12 +116,15 @@ const parseGlobal = d => dir => items => {
  *  (path: string) =>
  *  Path|undefined }
  */
-const parse = packageId => dependencies => local => path => {
-    const parsed = parseLocal(local)(path)
-    if (parsed === undefined) { return undefined }
-    const {external, dir, items } = parsed
-    if (!external) { return { package: packageId, items, dir } }
-    return parseGlobal(dependencies)(dir)(items)
+const parse = packageId => dependencies => {
+    const pg = parseGlobal(dependencies)
+    return local => path => {
+        const parsed = parseLocal(local)(path)
+        if (parsed === undefined) { return undefined }
+        const {external, dir, items } = parsed
+        if (!external) { return { package: packageId, items, dir } }
+        return pg(dir)(items)
+    }
 }
 
 /**

package/package.json

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