occam-languages 3.0.4 → 3.0.8

package/src/utilities/verification.js

@@ -4,25 +4,25 @@ import { Dependency } from "occam-model";
 import { arrayUtilities } from "necessary";
 
 import { every  } from "../utilities/continuation";
-import { asyncEvery  } from "../utilities/async";
 import { SINGLE_SPACE } from "../constants";
 
 const { last } = arrayUtilities;
 
-export async function createReleaseContexts(dependencyName, context) {
-  let releaseContextsCreated = false;
-
+export function createReleaseContexts(dependencyName, context, fail, succeed) {
   const name = dependencyName,  ///
         dependency = Dependency.fromName(name),
         dependentNames = [],
-        dependentReleased = false,
-        releaseContextCreated = await createReleaseContext(dependency, dependentNames, dependentReleased, context);
+        dependentReleased = false;
 
-  if (releaseContextCreated) {
-    releaseContextsCreated = true;
-  }
+  return createReleaseContext(dependency, dependentNames, dependentReleased, context, fail, (releaseContextCreated) => {
+    let releaseContextsCreated = false;
+
+    if (releaseContextCreated) {
+      releaseContextsCreated = true;
+    }
 
-  return releaseContextsCreated;
+    return succeed(releaseContextsCreated);
+  });
 }
 
 export function initialiseReleaseContexts(context) {
@@ -33,10 +33,12 @@ export function initialiseReleaseContexts(context) {
   });
 }
 
-export function verifyReleaseContexts(context, contiunation) {
-  const { releaseContexts } = context;
+export function verifyReleaseContexts(context, fail, succeed) {
+  const { releaseContexts } = context,
+        back = fail,  ///
+        forward = succeed;  ///
 
-  return every(releaseContexts, verifyReleaseContext, context, contiunation);
+  return every(releaseContexts, verifyReleaseContext, context, back, forward);
 }
 
 export default {
@@ -45,14 +47,12 @@ export default {
   verifyReleaseContexts
 };
 
-function verifyReleaseContext(releaseContext, context, contiunation) {
+function verifyReleaseContext(releaseContext, context, back, forward) {
   const released = releaseContext.isReleased(),
         verified = releaseContext.hasVerified();
 
   if (released || verified) {
-    const releaseContextVerifies = true;
-
-    return contiunation(releaseContextVerifies, context);
+    return forward();
   }
 
   const { log } = context,
@@ -61,85 +61,78 @@ function verifyReleaseContext(releaseContext, context, contiunation) {
 
   log.info(`Verifying the '${releaseName}' project...`);
 
-  return releaseContext.verify((verifies) => {
-    let releaseContextVerifies = false;
-
-    if (verifies) {
-      log.info(`...verified the '${releaseName}' project.`);
-
-      releaseContextVerifies = true;
-    }
+  return releaseContext.verify(back, () => {
+    log.info(`...verified the '${releaseName}' project.`);
 
-    return contiunation(releaseContextVerifies, context);
+    return forward();
   });
 }
 
-async function createReleaseContext(dependency, dependentNames, dependentReleased, context) {
-  let releaseContextCreated = false;
-
+function createReleaseContext(dependency, dependentNames, dependentReleased, context, fail, succeed) {
   const { log } = context,
-        dependencyName = dependency.getName();
+        releaseContext = findReleaseContext(dependency, context);
 
-  let releaseContext;
+  if (releaseContext !== null) {
+    const releaseContextCreated = true;
 
-  releaseContext = findReleaseContext(dependency, context);
+    return succeed(releaseContextCreated);
+  }
 
-  const releaseContextFound = (releaseContext !== null);
+  const dependencyName = dependency.getName(),
+        dependentNamesLength = dependentNames.length;
 
-  if (!releaseContextFound) {
-    const dependentNamesLength = dependentNames.length,
+  if (dependentNamesLength === 0) {
+    log.info(`Creating the '${dependencyName}' package context...`);
+  } else {
+    const lastDependentName = last(dependentNames),
+          dependentName = lastDependentName,  ///
           dependencyString = dependency.asString();
 
-    if (dependentNamesLength === 0) {
-      log.info(`Creating the '${dependencyName}' package context...`);
-    } else {
-      const lastDependentName = last(dependentNames),
-            dependentName = lastDependentName;  ///
+    log.info(`Creating the '${dependencyName}' package context given the '${dependentName}' dependant's '${dependencyString}' dependency...`);
+  }
 
-      log.info(`Creating the '${dependencyName}' package context given the '${dependentName}' dependant's '${dependencyString}' dependency...`);
-    }
+  const { releaseContextFromDependency } = context;
 
-    const { releaseContextFromDependency } = context;
+  releaseContextFromDependency(dependency, context, fail, (releaseContext) => {
+    let releaseContextCreated = false;
 
-    releaseContext = await releaseContextFromDependency(dependency, context);
-  }
+    const releatePresent = checkReleasePresent(releaseContext, dependencyName, context);
+
+    if (!releatePresent) {
+      return succeed(releaseContextCreated);
+    }
 
-  if (releaseContext === null) {
-    log.warning(`The '${dependencyName}' package context could not be created. Perhaps the 'meta.json' file is missing or invalid.`);
-  } else {
     const projectDependencyOfPackage = checkProjectDependencyOfPackage(releaseContext, dependentReleased, dependentNames, context);
 
-    if (!projectDependencyOfPackage) {
-      const releaseMatchesDependency = checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context);
+    if (projectDependencyOfPackage) {
+      return succeed(releaseContextCreated);
+    }
+
+    const releaseMatchesDependency = checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context);
 
-      if (releaseMatchesDependency) {
-        if (releaseContextFound) {
-          releaseContextCreated = true;
-        } else {
-          const dependencyReleaseContextsCreated = await createDependencyReleaseContexts(releaseContext, dependency, dependentNames, context);
+    if (!releaseMatchesDependency) {
+      return succeed(releaseContextCreated);
+    }
 
-          if (dependencyReleaseContextsCreated) {
-            addReleaseContext(releaseContext, context);
+    return createDependencyReleaseContexts(releaseContext, dependency, dependentNames, context, fail, (dependencyReleaseContextsCreated) => {
+      if (dependencyReleaseContextsCreated) {
+        releaseContextCreated = true;
+      }
 
-            releaseContextCreated = true;
-          }
-        }
+      if (releaseContextCreated) {
+        addReleaseContext(releaseContext, context);
       }
-    }
 
-    if (!releaseContextFound) {
       releaseContextCreated ?
         log.debug(`...created the '${dependencyName}' package context.`) :
           log.warning(`...unable to create the '${dependencyName}' package context.`);
-    }
-  }
 
-  return releaseContextCreated;
+      return succeed(releaseContextCreated);
+    });
+  });
 }
 
-async function createDependencyReleaseContexts(releaseContext, dependency, dependentNames, context) {
-  let dependencyReleaseContextsCreated;
-
+function createDependencyReleaseContexts(releaseContext, dependency, dependentNames, context, fail, succeed) {
   const name = releaseContext.getName(),
         released = releaseContext.isReleased(),
         dependencies = releaseContext.getDependencies(),
@@ -150,19 +143,19 @@ async function createDependencyReleaseContexts(releaseContext, dependency, depen
 
   const array = dependencies.getArray();
 
-  dependencyReleaseContextsCreated = await asyncEvery(array, async (dependency) => {
+  return every(array, (dependency, back, forward) => {
     const cyclicDependencyPresent = checkCyclicDependencyPresent(dependency, dependentNames, context);
 
-    if (!cyclicDependencyPresent) {
-      const releaseContextCreated = await createReleaseContext(dependency, dependentNames, dependentReleased, context);
-
-      if (releaseContextCreated) {
-        return true;
-      }
+    if (cyclicDependencyPresent) {
+      return back();
     }
-  });
 
-  return dependencyReleaseContextsCreated;
+    return createReleaseContext(dependency, dependentNames, dependentReleased, context, fail, (releaseContextCreated) => {
+      return (releaseContextCreated) ?
+                forward() :
+                  back();
+    });
+  }, () => succeed(false), () => succeed(true));
 }
 
 function addReleaseContext(releaseContext, context) {
@@ -185,6 +178,20 @@ function findReleaseContext(dependency, context) {
   return releaseContext;
 }
 
+function checkReleasePresent(releaseContext, dependencyName, context) {
+  let releasePresent = true;
+
+  if (releaseContext === null) {
+    const { log } = context;
+
+    log.warning(`The '${dependencyName}' package context could not be created. Perhaps the 'meta.json' file is missing or invalid.`);
+
+    releasePresent = false;
+  }
+
+  return releasePresent;
+}
+
 function retrieveReleaseContexts(releaseContext, context, releaseContexts = []) {
   const releaseContextsIncludesReleaseContext = releaseContexts.includes(releaseContext);
 

package/src/utilities/verify.js

@@ -6,10 +6,10 @@ import { resolve } from "../utilities/continuation";
 
 const { first, filter, compress } = arrayUtilities;
 
-export function verifyFileContexts(fileContexts, verifiedFileContexts, contiunation) {
-  return resolve(fileContexts, verifiedFileContexts, (fileContext, contiunation) => {
-    return fileContext.verify(contiunation);
-  }, contiunation);
+export function verifyFileContexts(fileContexts, verifiedFileContexts, back, forward) {
+  return resolve(fileContexts, verifiedFileContexts, (fileContext, back, forward) => {
+    return fileContext.verify(back, forward);
+  }, back, forward);
 }
 
 export function verifyTypePrefixes(typePrefixes, releaseContext) {

package/lib/utilities/async.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get asyncEvery () {
-        return asyncEvery;
-    },
-    get asyncForEach () {
-        return asyncForEach;
-    },
-    get asyncReduce () {
-        return asyncReduce;
-    },
-    get asyncSome () {
-        return asyncSome;
-    }
-});
-async function asyncSome(array, callback) {
-    let result = false;
-    const length = array.length;
-    for(let index = 0; index < length; index += 1){
-        const element = array[index];
-        result = !!await callback(element, index, array);
-        if (result) {
-            break;
-        }
-    }
-    return result;
-}
-async function asyncEvery(array, callback) {
-    let result = true;
-    const length = array.length;
-    for(let index = 0; index < length; index += 1){
-        const element = array[index];
-        result = !!await callback(element, index, array);
-        if (!result) {
-            break;
-        }
-    }
-    return result;
-}
-async function asyncReduce(array, callback, initialValue) {
-    let value = initialValue; ///
-    const length = array.length;
-    for(let index = 0; index < length; index += 1){
-        const element = array[index];
-        value = await callback(value, element, index, array);
-    }
-    return value;
-}
-async function asyncForEach(array, callback) {
-    const length = array.length;
-    for(let index = 0; index < length; index += 1){
-        const element = array[index];
-        await callback(element, index, array);
-    }
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXN5bmMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBhc3luY1NvbWUoYXJyYXksIGNhbGxiYWNrKSB7XG4gIGxldCByZXN1bHQgPSBmYWxzZTtcblxuICBjb25zdCBsZW5ndGggPSBhcnJheS5sZW5ndGg7XG5cbiAgZm9yIChsZXQgaW5kZXggPSAwOyBpbmRleCA8IGxlbmd0aDsgaW5kZXggKz0gMSkge1xuICAgIGNvbnN0IGVsZW1lbnQgPSBhcnJheVtpbmRleF07XG5cbiAgICByZXN1bHQgPSAhIWF3YWl0IGNhbGxiYWNrKGVsZW1lbnQsIGluZGV4LCBhcnJheSk7XG5cbiAgICBpZiAocmVzdWx0KSB7XG4gICAgICBicmVhaztcbiAgICB9XG4gIH1cblxuICByZXR1cm4gcmVzdWx0O1xufVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gYXN5bmNFdmVyeShhcnJheSwgY2FsbGJhY2spIHtcbiAgbGV0IHJlc3VsdCA9IHRydWU7XG5cbiAgY29uc3QgbGVuZ3RoID0gYXJyYXkubGVuZ3RoO1xuXG4gIGZvciAobGV0IGluZGV4ID0gMDsgaW5kZXggPCBsZW5ndGg7IGluZGV4ICs9IDEpIHtcbiAgICBjb25zdCBlbGVtZW50ID0gYXJyYXlbaW5kZXhdO1xuXG4gICAgcmVzdWx0ID0gISFhd2FpdCBjYWxsYmFjayhlbGVtZW50LCBpbmRleCwgYXJyYXkpO1xuXG4gICAgaWYgKCFyZXN1bHQpIHtcbiAgICAgIGJyZWFrO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiByZXN1bHQ7XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBhc3luY1JlZHVjZShhcnJheSwgY2FsbGJhY2ssIGluaXRpYWxWYWx1ZSkge1xuICBsZXQgdmFsdWUgPSBpbml0aWFsVmFsdWU7IC8vL1xuXG4gIGNvbnN0IGxlbmd0aCA9IGFycmF5Lmxlbmd0aDtcblxuICBmb3IgKGxldCBpbmRleCA9IDA7IGluZGV4IDwgbGVuZ3RoOyBpbmRleCArPSAxKSB7XG4gICAgY29uc3QgZWxlbWVudCA9IGFycmF5W2luZGV4XTtcblxuICAgIHZhbHVlID0gYXdhaXQgY2FsbGJhY2sodmFsdWUsIGVsZW1lbnQsIGluZGV4LCBhcnJheSk7XG4gIH1cblxuICByZXR1cm4gdmFsdWU7XG59XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBhc3luY0ZvckVhY2goYXJyYXksIGNhbGxiYWNrKSB7XG4gIGNvbnN0IGxlbmd0aCA9IGFycmF5Lmxlbmd0aDtcblxuICBmb3IgKGxldCBpbmRleCA9IDA7IGluZGV4IDwgbGVuZ3RoOyBpbmRleCArPSAxKSB7XG4gICAgY29uc3QgZWxlbWVudCA9IGFycmF5W2luZGV4XTtcblxuICAgIGF3YWl0IGNhbGxiYWNrKGVsZW1lbnQsIGluZGV4LCBhcnJheSk7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJhc3luY0V2ZXJ5IiwiYXN5bmNGb3JFYWNoIiwiYXN5bmNSZWR1Y2UiLCJhc3luY1NvbWUiLCJhcnJheSIsImNhbGxiYWNrIiwicmVzdWx0IiwibGVuZ3RoIiwiaW5kZXgiLCJlbGVtZW50IiwiaW5pdGlhbFZhbHVlIiwidmFsdWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQW9Cc0JBO2VBQUFBOztRQWdDQUM7ZUFBQUE7O1FBZEFDO2VBQUFBOztRQXBDQUM7ZUFBQUE7OztBQUFmLGVBQWVBLFVBQVVDLEtBQUssRUFBRUMsUUFBUTtJQUM3QyxJQUFJQyxTQUFTO0lBRWIsTUFBTUMsU0FBU0gsTUFBTUcsTUFBTTtJQUUzQixJQUFLLElBQUlDLFFBQVEsR0FBR0EsUUFBUUQsUUFBUUMsU0FBUyxFQUFHO1FBQzlDLE1BQU1DLFVBQVVMLEtBQUssQ0FBQ0ksTUFBTTtRQUU1QkYsU0FBUyxDQUFDLENBQUMsTUFBTUQsU0FBU0ksU0FBU0QsT0FBT0o7UUFFMUMsSUFBSUUsUUFBUTtZQUNWO1FBQ0Y7SUFDRjtJQUVBLE9BQU9BO0FBQ1Q7QUFFTyxlQUFlTixXQUFXSSxLQUFLLEVBQUVDLFFBQVE7SUFDOUMsSUFBSUMsU0FBUztJQUViLE1BQU1DLFNBQVNILE1BQU1HLE1BQU07SUFFM0IsSUFBSyxJQUFJQyxRQUFRLEdBQUdBLFFBQVFELFFBQVFDLFNBQVMsRUFBRztRQUM5QyxNQUFNQyxVQUFVTCxLQUFLLENBQUNJLE1BQU07UUFFNUJGLFNBQVMsQ0FBQyxDQUFDLE1BQU1ELFNBQVNJLFNBQVNELE9BQU9KO1FBRTFDLElBQUksQ0FBQ0UsUUFBUTtZQUNYO1FBQ0Y7SUFDRjtJQUVBLE9BQU9BO0FBQ1Q7QUFFTyxlQUFlSixZQUFZRSxLQUFLLEVBQUVDLFFBQVEsRUFBRUssWUFBWTtJQUM3RCxJQUFJQyxRQUFRRCxjQUFjLEdBQUc7SUFFN0IsTUFBTUgsU0FBU0gsTUFBTUcsTUFBTTtJQUUzQixJQUFLLElBQUlDLFFBQVEsR0FBR0EsUUFBUUQsUUFBUUMsU0FBUyxFQUFHO1FBQzlDLE1BQU1DLFVBQVVMLEtBQUssQ0FBQ0ksTUFBTTtRQUU1QkcsUUFBUSxNQUFNTixTQUFTTSxPQUFPRixTQUFTRCxPQUFPSjtJQUNoRDtJQUVBLE9BQU9PO0FBQ1Q7QUFFTyxlQUFlVixhQUFhRyxLQUFLLEVBQUVDLFFBQVE7SUFDaEQsTUFBTUUsU0FBU0gsTUFBTUcsTUFBTTtJQUUzQixJQUFLLElBQUlDLFFBQVEsR0FBR0EsUUFBUUQsUUFBUUMsU0FBUyxFQUFHO1FBQzlDLE1BQU1DLFVBQVVMLEtBQUssQ0FBQ0ksTUFBTTtRQUU1QixNQUFNSCxTQUFTSSxTQUFTRCxPQUFPSjtJQUNqQztBQUNGIn0=

package/src/utilities/async.js

@@ -1,61 +0,0 @@
-"use strict";
-
-export async function asyncSome(array, callback) {
-  let result = false;
-
-  const length = array.length;
-
-  for (let index = 0; index < length; index += 1) {
-    const element = array[index];
-
-    result = !!await callback(element, index, array);
-
-    if (result) {
-      break;
-    }
-  }
-
-  return result;
-}
-
-export async function asyncEvery(array, callback) {
-  let result = true;
-
-  const length = array.length;
-
-  for (let index = 0; index < length; index += 1) {
-    const element = array[index];
-
-    result = !!await callback(element, index, array);
-
-    if (!result) {
-      break;
-    }
-  }
-
-  return result;
-}
-
-export async function asyncReduce(array, callback, initialValue) {
-  let value = initialValue; ///
-
-  const length = array.length;
-
-  for (let index = 0; index < length; index += 1) {
-    const element = array[index];
-
-    value = await callback(value, element, index, array);
-  }
-
-  return value;
-}
-
-export async function asyncForEach(array, callback) {
-  const length = array.length;
-
-  for (let index = 0; index < length; index += 1) {
-    const element = array[index];
-
-    await callback(element, index, array);
-  }
-}