occam-verify-cli 0.0.334 → 0.0.336

package/src/rule.js

@@ -2,7 +2,7 @@
 
 import { prune } from "./utilities/array";
 import { someSubArray } from "./utilities/array";
-import { labelsAsString } from "./utilities/string";
+import { lineIndexFromLabelsAndTokens } from "./utilities/tokens";
 
 export default class Rule {
   constructor(labels, premises, conclusion) {
@@ -61,14 +61,30 @@ export default class Rule {
     return metastatementNatches;
   }
 
-  asString() {
-    const string = labelsAsString(this.labels);
-
-    return string;
-  }
-
-  asJSON(tokens) {
-
+  toJSON(tokens) {
+    const lineIndex = lineIndexFromLabelsAndTokens(this.labels, tokens),
+          labelsJSON = this.labels.map((label) => {
+            const labelJSON = label.toJSON();
+
+            return labelJSON;
+          }),
+          premisesJSON = this.premises.map((premise) => {
+            const premiseJSON = premise.toJSON();
+
+            return premiseJSON;
+          }),
+          conclusionJSON = this.conclusion.toJSON(),
+          labels = labelsJSON,  ///
+          premises = premisesJSON,  ///
+          conclusion = conclusionJSON,  ///
+          json = {
+            lineIndex,
+            labels,
+            premises,
+            conclusion
+          };
+
+    return json;
   }
 
   static fromLabelsPremisesAndConclusion(labels, premises, conclusion) {

package/src/type.js

@@ -101,6 +101,20 @@ export default class Type {
     return string;
   }
 
+  toJSON() {
+    const superTypeJSON = (this.superType === null) ?
+                            null :
+                              this.superType.toJSON(),
+          name = this.name,
+          superType = superTypeJSON,  ///
+          json = {
+            name,
+            superType
+          };
+
+    return json;
+  }
+
   static fromTypeName(typeName) {
     const name = typeName,  ///
           superType = null,

package/src/utilities/tokens.js

@@ -1,5 +1,19 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
+const { first } = arrayUtilities;
+
+export function lineIndexFromLabelsAndTokens(labels, tokens) {
+  const firstLabel = first(labels),
+        label = firstLabel, ///
+        node = label.getNode(),
+        leastLineIndex = leastLineIndexFromNodeAndTokens(node, tokens),
+        lineIndex = leastLineIndex; ///
+
+  return lineIndex;
+}
+
 export function leastLineIndexFromNodeAndTokens(node, tokens) {
   let leastLineIndex = undefined; ///
 

package/src/verify/files.js

@@ -2,13 +2,25 @@
 
 import verifyFile from "../verify/file";
 
-import { leftDifference } from "../utilities/array";
+import { filePathUtilities } from "occam-file-system";
+
+import { filter, leftDifference } from "../utilities/array";
+
+const { isFilePathFlorenceFilePath } = filePathUtilities;
 
 export default function verifyFiles(releaseContext) {
   let filesVerified = false;
 
   const filePaths = releaseContext.getFilePaths();
 
+  filter(filePaths, (filePath) => {
+    const filePathFlorenceFilePath = isFilePathFlorenceFilePath(filePath);
+
+    if (filePathFlorenceFilePath) {
+      return true;
+    }
+  })
+
   for (;;) {
     const filePathsLength = filePaths.length;