occam-open-cli 5.0.44 → 5.0.46

package/src/project.js

@@ -1,16 +1,26 @@
 "use strict";
 
+import { MetaJSONLexer, MetaJSONParser } from "occam-grammars";
+
 import Entries from "./entries";
+import bnfMixin from "./mixin/bnf";
+import filesMixin from "./mixin/files";
+import Dependencies from "./dependencies";
+import entriesMixin from "./mixin/entries";
+import patternMixin from "./mixin/pattern";
+
+import { metaJSONFIleFromFiles } from "./utilities/files";
+import { repositoryFromNode, dependenciesFromNode } from "./utilities/metaJSON";
 
-import { isFilePathFlorenceFilePath,
-         isFilePathMetaJSONFilePath,
-         isFilePathCustomGrammarBNFFilePath,
-         isFilePathCustomGrammarPatternFilePath } from "./utilities/filePath";
+const metaJSONLexer = MetaJSONLexer.fromNothing(),
+      metaJSONParser = MetaJSONParser.fromNothing();
 
-export default class Project {
-  constructor(name, entries) {
+class Project {
+  constructor(name, entries, repository, dependencies) {
     this.name = name;
     this.entries = entries;
+    this.repository = repository;
+    this.dependendies = dependencies;
   }
 
   getName() {
@@ -21,112 +31,117 @@ export default class Project {
     return this.entries;
   }
 
-  getFiles() { return this.entries.getFiles(); }
+  getRepository() {
+    return this.repository;
+  }
 
-  getFilePaths() { return this.entries.getFilePaths(); }
+  getDependencies() {
+    return this.dependendies;
+  }
 
-  getDirectoryPaths() { return this.entries.getDirectoryPaths(); }
+  toJSON() {
+    const entriesJSON = this.entries.toJSON(),
+          dependenciesJSON = this.dependendies.toJSON(),
+          name = this.name,
+          entries = entriesJSON,  ///
+          repository = this.repository,
+          dependencies = dependenciesJSON,  ///
+          json = {
+            name,
+            entries,
+            repository,
+            dependencies
+          };
 
-  getFile(filePath) { return this.entries.getFile(filePath); }
+    return json;
+  }
 
-  getMetaJSONFile() {
-    const files = this.getFiles(),
-          metaJSONFile = files.findFile((file) => {
-          const filePath = file.getPath(),
-                filePathMetaJSONFilePath = isFilePathMetaJSONFilePath(filePath);
+  static fromJSON(json) {
+    let { entries, dependencies } = json;
 
-          if (filePathMetaJSONFilePath) {
-            return true;
-          }
-        });
+    const { name, repository } = json,
+          entriesJSON = entries,  ///
+          dependenciesJSON = dependencies; ///
 
-    return metaJSONFile;
-  }
+    json = entriesJSON; ///
 
-  getFlorenceFiles() {
-    const files = this.getFiles(),
-          florenceFiles = files.reduceFile((florenceFiles, file) => {
-            const filePath = file.getPath(),
-                  filePathFlorenceFilePath = isFilePathFlorenceFilePath(filePath),
-                  fileFlorenceFile = filePathFlorenceFilePath;  ///
+    entries = Entries.fromJSON(json); ///
 
-            if (fileFlorenceFile) {
-              const florenceFile = file;  ///
+    json = dependenciesJSON; ///
 
-              florenceFiles.push(florenceFile);
-            }
+    dependencies = Dependencies.fromJSON(json);
 
-            return florenceFiles;
-          }, []);
+    const release = new Release(name, entries, repository, dependencies);
 
-    return florenceFiles;
+    return release;
   }
 
-  getCustomGrammarBNFFiles() {
-    const files = this.getFiles(),
-          customGrammarBNFFiles = files.reduceFile((customGrammarBNFFiles, file) => {
-            const filePath = file.getPath(),
-                  filePathCustomGrammarBNFFilePath = isFilePathCustomGrammarBNFFilePath(filePath),
-                  fileCustomGrammarBNFFile = filePathCustomGrammarBNFFilePath;  ///
-
-            if (fileCustomGrammarBNFFile) {
-              const customGrammarBNFFile = file;  ///
+  static fromName(name) {
+    const entries = Entries.fromNothing(),
+          repository = null,  ///
+          dependencies = Dependencies.fromNothing(),
+          project = new Project(name, entries, repository, dependencies);
 
-              customGrammarBNFFiles.push(customGrammarBNFFile);
-            }
+    return project;
+  }
 
-            return customGrammarBNFFiles;
-          }, []);
+  static fromNameAndEntries(name, entries) {
+    const repository = repositoryFromEntries(entries),
+          dependencies = dependenciesFromEntries(entries),
+          project = new Project(name, entries, repository, dependencies);
 
-    return customGrammarBNFFiles;
+    return project;
   }
+}
 
-  getCustomGrammarPatternFiles() {
-    const files = this.getFiles(),
-          customGrammarPatternFiles = files.reduceFile((customGrammarPatternFiles, file) => {
-            const filePath = file.getPath(),
-                  filePathCustomGrammarPatternFilePath = isFilePathCustomGrammarPatternFilePath(filePath),
-                  fileCustomGrammarPatternFile = filePathCustomGrammarPatternFilePath;  ///
-
-            if (fileCustomGrammarPatternFile) {
-              const customGrammarPatternFile = file;  ///
+Object.assign(Project.prototype, bnfMixin);
+Object.assign(Project.prototype, filesMixin);
+Object.assign(Project.prototype, entriesMixin);
+Object.assign(Project.prototype, patternMixin);
 
-              customGrammarPatternFiles.push(customGrammarPatternFile);
-            }
+export default Project;
 
-            return customGrammarPatternFiles;
-          }, []);
+function repositoryFromEntries(entries) {
+  let repository = null;
 
-    return customGrammarPatternFiles;
-  }
+  const metaJSONFileNode = metaJSONFileNodeFromEntries(entries)
 
-  toJSON() {
-    const name = this.name,
-          entriesJSON = this.entries.toJSON(),
-          entries = entriesJSON,  ///
-          json = {
-            name,
-            entries
-          };
+  if (metaJSONFileNode !== null) {
+    const node = metaJSONFileNode;///
 
-    return json;
+    repository = repositoryFromNode(node);
   }
 
-  static fromJSON(json) {
-    const { name, entries: entriesJSON } = json;
+  return repository;
+}
 
-    json = entriesJSON; ///
+function dependenciesFromEntries(entries) {
+  let dependencies = [];
 
-    const entries = Entries.fromJSON(json),
-          project = new Project(name, entries);
+  const metaJSONFileNode = metaJSONFileNodeFromEntries(entries)
 
-    return project;
+  if (metaJSONFileNode !== null) {
+    const node = metaJSONFileNode;///
+
+    dependencies = dependenciesFromNode(node);
   }
 
-  static fromName(name) {
-    const entries = Entries.fromNothing(),
-          project = new Project(name, entries);
+  return dependencies;
+}
 
-    return project;
+function metaJSONFileNodeFromEntries(entries) {
+  let metaJSONFileNode = null;
+
+  const files = entries.getFiles(),
+        metaJSONFile = metaJSONFIleFromFiles(files);
+
+  if (metaJSONFile !== null) {
+    const content = metaJSONFile.getContent(),
+        tokens = metaJSONLexer.tokenise(content),
+        node = metaJSONParser.parse(tokens);
+
+    metaJSONFileNode = node;  ///
   }
+
+  return metaJSONFileNode;
 }

package/src/release.js

@@ -1,18 +1,20 @@
 "use strict";
 
 import Entries from "./entries";
-
-import { isFilePathReadmeFilePath,
-         isFilePathFlorenceFilePath,
-         isFilePathMetaJSONFilePath,
-         isFilePathCustomGrammarBNFFilePath,
-         isFilePathCustomGrammarPatternFilePath } from "./utilities/filePath";
-
-export default class Release {
-  constructor(name, entries, versionNumber) {
+import Version from "./version";
+import bnfMixin from "./mixin/bnf";
+import filesMixin from "./mixin/files";
+import Dependencies from "./dependencies";
+import entriesMixin from "./mixin/entries";
+import patternMixin from "./mixin/pattern";
+
+class Release {
+  constructor(name, entries, version, repository, dependencies) {
     this.name = name;
     this.entries = entries;
-    this.versionNumber = versionNumber;
+    this.version = version;
+    this.repository = repository;
+    this.dependendies = dependencies;
   }
 
   getName() {
@@ -23,143 +25,75 @@ export default class Release {
     return this.entries;
   }
 
-  getVersionNumber() {
-    return this.versionNumber;
+  getVersion() {
+    return this.version;
   }
 
-  getFile(filePath) { return this.entries.getFile(filePath); }
-
-  getFiles() { return this.entries.getFiles(); }
-
-  getFilePaths() { return this.entries.getFilePaths(); }
-
-  getReadmeFile() {
-    let readmeFile = null;
-
-    const files = this.getFiles();
-
-    files.someFile((file) => {
-      const filePath = file.getPath(),
-            filePathReadmeFilePath = isFilePathReadmeFilePath(filePath);
-
-      if (filePathReadmeFilePath) {
-        readmeFile = file;  ///
-
-        return true;
-      }
-    });
-
-    return readmeFile;
+  getRepository() {
+    return this.repository;
   }
 
-  getMetaJSONFile() {
-    let metaJSONFile = null;
-
-    const files = this.getFiles();
-
-    files.someFile((file) => {
-      const filePath = file.getPath(),
-            filePathMetaJSONFilePath = isFilePathMetaJSONFilePath(filePath);
-
-      if (filePathMetaJSONFilePath) {
-        metaJSONFile = file;  ///
-
-        return true;
-      }
-    });
-
-    return metaJSONFile;
-  }
-
-  getFlorenceFiles() {
-    const files = this.getFiles(),
-        florenceFiles = files.reduceFile((florenceFiles, file) => {
-          const filePath = file.getPath(),
-              filePathFlorenceFilePath = isFilePathFlorenceFilePath(filePath),
-              fileFlorenceFile = filePathFlorenceFilePath;  ///
-
-          if (fileFlorenceFile) {
-            const florenceFile = file;  ///
-
-            florenceFiles.push(florenceFile);
-          }
-
-          return florenceFiles;
-        }, []);
-
-    return florenceFiles;
-  }
-
-  getCustomGrammarBNFFiles() {
-    const files = this.getFiles(),
-          customGrammarBNFFiles = files.reduceFile((customGrammarBNFFiles, file) => {
-          const filePath = file.getPath(),
-                filePathCustomGrammarBNFFilePath = isFilePathCustomGrammarBNFFilePath(filePath),
-                fileCustomGrammarBNFFile = filePathCustomGrammarBNFFilePath;  ///
-
-          if (fileCustomGrammarBNFFile) {
-            const customGrammarBNFFile = file;  ///
-
-            customGrammarBNFFiles.push(customGrammarBNFFile);
-          }
-
-          return customGrammarBNFFiles;
-        }, []);
-
-    return customGrammarBNFFiles;
-  }
-
-  getCustomGrammarPatternFiles() {
-    const files = this.getFiles(),
-          customGrammarPatternFiles = files.reduceFile((customGrammarPatternFiles, file) => {
-            const filePath = file.getPath(),
-                filePathCustomGrammarPatternFilePath = isFilePathCustomGrammarPatternFilePath(filePath),
-                fileCustomGrammarPatternFile = filePathCustomGrammarPatternFilePath;  ///
-
-            if (fileCustomGrammarPatternFile) {
-              const customGrammarPatternFile = file;  ///
-
-              customGrammarPatternFiles.push(customGrammarPatternFile);
-            }
-
-            return customGrammarPatternFiles;
-          }, []);
-
-    return customGrammarPatternFiles;
+  getDependencies() {
+    return this.dependendies;
   }
 
   toJSON() {
     const entriesJSON = this.entries.toJSON(),
+          versionJSON = this.version.toJSON(),
+          dependenciesJSON = this.dependendies.toJSON(),
           name = this.name,
           entries = entriesJSON,  ///
-          versionNumber = this.versionNumber,
+          version = versionJSON,  ///
+          repository = this.repository,
+          dependencies = dependenciesJSON,  ///
           json = {
             name,
             entries,
-            versionNumber
+            version,
+            repository,
+            dependencies
           };
 
     return json;
   }
 
   static fromJSON(json) {
-    let { entries } = json;
+    let { entries, version, dependencies } = json;
 
-    const { name, versionNumber } = json,
-          entriesJSON = entries;  ///
+    const { name, repository } = json,
+          entriesJSON = entries,  ///
+          versionJSOM = version,  ///
+          dependenciesJSON = dependencies; ///
 
     json = entriesJSON; ///
 
     entries = Entries.fromJSON(json); ///
 
-    const release = new Release(name, entries, versionNumber);
+    json = versionJSOM; ///
+
+    version = Version.fromJSON(json);
+
+    json = dependenciesJSON; ///
+
+    dependencies = Dependencies.fromJSON(json);
+
+    const release = new Release(name, entries, version, repository, dependencies);
 
     return release;
   }
 
-  static fromNameEntriesAndVersionNumber(name, entries, versionNumber) {
-    const release = new Release(name, entries, versionNumber);
+  static fromNameEntriesAndVersion(name, entries, version) {
+    const repository = repository,
+          dependencies = Dependencies.fromNothing(),
+          release = new Release(name, entries, version, repository, dependencies);
 
     return release;
   }
 }
+
+Objecct.assign(Release.prototype, bnfMixin);
+Objecct.assign(Release.prototype, filesMixin);
+Objecct.assign(Release.prototype, entriesMixin);
+Objecct.assign(Release.prototype, patternMixin);
+
+export default Release;

package/src/shortenedVersion.js

@@ -0,0 +1,109 @@
+"use strict";
+
+import { arrayUtilities } from "necessary";
+
+const { second } = arrayUtilities;
+
+export default class ShortenedVersion {
+  constructor(majorNumber, minorNumber) {
+    this.majorNumber = majorNumber;
+    this.minorNumber = minorNumber;
+  }
+
+  getMajorNumber() {
+    return this.majorNumber;
+  }
+
+  getMinorNumber() {
+    return this.minorNumber;
+  }
+
+  toString() {
+    const string = `${this.majorNumber}.${this.minorNumber}`;
+
+    return string;
+  }
+
+  asNumber() {
+    const number = this.majorNumber * 1e12 + this.minorNumber * 1e6; ///
+
+    return number;
+  }
+
+  toJSON() {
+    const majorNumber = this.majorNumber,
+          minorNumber = this.minorNumber,
+          json = {
+            majorNumber,
+            minorNumber
+          };
+
+    return json;
+  }
+
+  static fromJSON(json) {
+    const { majorNumber, minorNumber } = json,
+          shortenedVersion = new ShortenedVersion(majorNumber, minorNumber);
+
+    return shortenedVersion;
+  }
+
+  static fromString(string) {
+    const majorNumber = majorNumberFromString(string),
+          minorNumber = minorNumberFromString(string),
+          shortenedVersion = new ShortenedVersion(majorNumber, minorNumber);
+
+    return shortenedVersion;
+  }
+
+  static fromVersionNumber(versionNumber) {
+    const number = versionNumber, ///
+          majorNumber = majorNumberFromNumber(number),
+          minorNumber = minorNumberFromNumber(number),
+          shortenedVersion = new ShortenedVersion(majorNumber, minorNumber);
+
+    return shortenedVersion;
+  }
+}
+
+function majorNumberFromNumber(number) {
+  const majorNumber = (number !== null) ?
+                        Math.floor(number / 1e12) :
+                          0;  ///
+
+  return majorNumber;
+}
+
+function minorNumberFromNumber(number) {
+  const minorNumber = (number !== null) ?
+                        Math.floor(number / 1e6) :
+                          0;  ///
+
+  return minorNumber;
+}
+
+function majorNumberFromString(string) {
+  let majorNumber = 0;
+
+  if (string) {
+    const matches = string.match(/^(\d+)\.\d+$/),
+          secondMatch = second(matches);
+
+    majorNumber = secondMatch;  ///
+  }
+
+  return majorNumber;
+}
+
+function minorNumberFromString(string) {
+  let minorNumber = 0;
+
+  if (string) {
+    const matches = string.match(/^\d+\.(\d+)$/),
+          secondMatch = second(matches);
+
+    minorNumber = secondMatch;  ///
+  }
+
+  return minorNumber;
+}

package/src/utilities/content.js

@@ -1,9 +1,12 @@
 "use strict";
 
-import { DOUBLE_SPACE } from "../constants";
+import { EMPTY_STRING, DOUBLE_SPACE } from "../constants";
+
+export function trimDoubleQuotes(content) { return content.replace(/(^"|"$)/g, EMPTY_STRING); } ///
 
 export function convertContentTabsToWhitespace(content) { return content.replace(/\t/g, DOUBLE_SPACE); } ///
 
 export default {
+  trimDoubleQuotes,
   convertContentTabsToWhitespace
 };

package/src/utilities/files.js

@@ -0,0 +1,103 @@
+"use strict";
+
+import { isFilePathReadmeFilePath,
+         isFilePathFlorenceFilePath,
+         isFilePathMetaJSONFilePath,
+         isFilePathCustomGrammarBNFFilePath,
+         isFilePathCustomGrammarPatternFilePath } from "../utilities/filePath";
+
+function readmeFileFromFiles(files) {
+  let readmeFile = null;
+
+  files.someFile((file) => {
+    const filePath = file.getPath(),
+          filePathReadmeFilePath = isFilePathReadmeFilePath(filePath);
+
+    if (filePathReadmeFilePath) {
+      readmeFile = file;  ///
+
+      return true;
+    }
+  });
+
+  return readmeFile;
+}
+
+function metaJSONFileFromFiles(files) {
+  let metaJSONFile = null;
+
+  files.someFile((file) => {
+    const filePath = file.getPath(),
+          filePathMetaJSONFilePath = isFilePathMetaJSONFilePath(filePath);
+
+    if (filePathMetaJSONFilePath) {
+      metaJSONFile = file;  ///
+
+      return true;
+    }
+  });
+
+  return metaJSONFile;
+}
+
+function florenceFilesFromFiles(files) {
+  const florenceFiles = files.reduceFile((florenceFiles, file) => {
+          const filePath = file.getPath(),
+                filePathFlorenceFilePath = isFilePathFlorenceFilePath(filePath),
+                fileFlorenceFile = filePathFlorenceFilePath;  ///
+
+          if (fileFlorenceFile) {
+            const florenceFile = file;  ///
+
+            florenceFiles.push(florenceFile);
+          }
+
+          return florenceFiles;
+        }, []);
+
+  return florenceFiles;
+}
+
+function customGrammarBNFFilesFromFiles(files) {
+  const customGrammarBNFFiles = files.reduceFile((customGrammarBNFFiles, file) => {
+          const filePath = file.getPath(),
+                filePathCustomGrammarBNFFilePath = isFilePathCustomGrammarBNFFilePath(filePath),
+                fileCustomGrammarBNFFile = filePathCustomGrammarBNFFilePath;  ///
+
+          if (fileCustomGrammarBNFFile) {
+            const customGrammarBNFFile = file;  ///
+
+            customGrammarBNFFiles.push(customGrammarBNFFile);
+          }
+
+          return customGrammarBNFFiles;
+        }, []);
+
+  return customGrammarBNFFiles;
+}
+
+function customGrammarPatternFilesFromFiles(files) {
+  const customGrammarPatternFiles = files.reduceFile((customGrammarPatternFiles, file) => {
+          const filePath = file.getPath(),
+                filePathCustomGrammarPatternFilePath = isFilePathCustomGrammarPatternFilePath(filePath),
+                fileCustomGrammarPatternFile = filePathCustomGrammarPatternFilePath;  ///
+
+          if (fileCustomGrammarPatternFile) {
+            const customGrammarPatternFile = file;  ///
+
+            customGrammarPatternFiles.push(customGrammarPatternFile);
+          }
+
+          return customGrammarPatternFiles;
+        }, []);
+
+  return customGrammarPatternFiles;
+}
+
+export default {
+  readmeFileFromFiles,
+  metaJSONFileFromFiles,
+  florenceFilesFromFiles,
+  customGrammarBNFFilesFromFiles,
+  customGrammarPatternFilesFromFiles
+};