occam-verify-cli 0.0.962 → 0.0.963
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -76,7 +76,7 @@ function checkReleaseContextCreated(releaseContext, dependency, context) {
|
|
|
76
76
|
var releaseContextCreated = releaseContext !== null;
|
|
77
77
|
if (!releaseContextCreated) {
|
|
78
78
|
var log = context.log, dependencyName = dependency.getName(), releaseName = dependencyName; ///
|
|
79
|
-
log.
|
|
79
|
+
log.warning("The '".concat(releaseName, "' context could not be created. Perhaps the 'meta.json' file is missing or invalid. Or there could be a dependency mismatch."));
|
|
80
80
|
}
|
|
81
81
|
return releaseContextCreated;
|
|
82
82
|
}
|
|
@@ -86,7 +86,7 @@ function checkCyclicDependencyExists(dependency, dependentNames, context) {
|
|
|
86
86
|
var log = context.log, firstDependentName = first(dependentNames), dependencyNames = _to_consumable_array(dependentNames).concat([
|
|
87
87
|
firstDependentName
|
|
88
88
|
]), dependencyNamesString = dependencyNames.join("' -> '");
|
|
89
|
-
log.
|
|
89
|
+
log.warning("There is a cyclic dependency: '".concat(dependencyNamesString, "'."));
|
|
90
90
|
}
|
|
91
91
|
return cyclicDependencyExists;
|
|
92
92
|
}
|
|
@@ -128,4 +128,4 @@ function createDependencyReleaseContexts(dependency, releaseContext, dependentNa
|
|
|
128
128
|
});
|
|
129
129
|
}
|
|
130
130
|
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/releaseContext/create.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport default function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { log, releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        dependencyString = dependency.asString(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  log.debug(`Creating the '${releaseName}' context given the '${dependencyString}' dependency...`);\n\n  if (releaseContext !== null) {\n    const error = null;\n\n    log.debug(`...already created the '${releaseName}' context.`);\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependency } = context;\n\n  releaseContextFromDependency(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    const releaseContextCreated = checkReleaseContextCreated(releaseContext, dependency, context);\n\n    if (!releaseContextCreated) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    const releaseMatchesDependency = checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context);\n\n    if (!releaseMatchesDependency) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    log.info(`...created the '${releaseName}' context.`);\n\n    createDependencyReleaseContexts(dependency, releaseContext, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      callback(error);\n    });\n  }, context);\n}\n\nfunction checkReleaseContextCreated(releaseContext, dependency, context) {\n  const releaseContextCreated = (releaseContext !== null);\n\n  if (!releaseContextCreated) {\n    const { log } = context,\n          dependencyName = dependency.getName(),\n          releaseName = dependencyName; ///\n\n    log.error(`The '${releaseName}' context could not be created. Perhaps the 'meta.json' file is missing or invalid. Or there could be a dependency mismatch.`);\n  }\n\n  return releaseContextCreated;\n}\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n            ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context) {\n  let releaseMatchesDependency = true;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      const { log } = context,\n            version = releaseContext.getVersion(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            versionString = version.toString(),\n            dependencyString = dependency.asString();\n\n      log.warning(`Version mismatch: The '${dependentName}' dependent requires the '${dependencyString}' dependency but a context with version '${versionString}' was provided.`);\n\n      releaseMatchesDependency = false;\n    }\n  }\n\n  return releaseMatchesDependency;\n}\n\nfunction createDependencyReleaseContexts(dependency, releaseContext, dependentNames, context, callback) {\n  const dependencyName = dependency.getName(),\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, () => {\n    const error = null;\n\n    callback(error);\n  });\n}\n"],"names":["createReleaseContext","dependency","dependentNames","context","callback","log","releaseContextMap","dependencyName","getName","dependencyString","asString","releaseName","releaseContext","debug","error","releaseContextFromDependency","releaseContextCreated","checkReleaseContextCreated","releaseMatchesDependency","checkReleaseMatchesDependency","info","createDependencyReleaseContexts","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","version","getVersion","lastDependentName","last","dependentName","versionString","toString","warning","dependencies","getDependencies","asynchronousForEachDependency","next","done"],"mappings":"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"}
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/releaseContext/create.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport default function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { log, releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        dependencyString = dependency.asString(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  log.debug(`Creating the '${releaseName}' context given the '${dependencyString}' dependency...`);\n\n  if (releaseContext !== null) {\n    const error = null;\n\n    log.debug(`...already created the '${releaseName}' context.`);\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependency } = context;\n\n  releaseContextFromDependency(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    const releaseContextCreated = checkReleaseContextCreated(releaseContext, dependency, context);\n\n    if (!releaseContextCreated) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    const releaseMatchesDependency = checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context);\n\n    if (!releaseMatchesDependency) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    log.info(`...created the '${releaseName}' context.`);\n\n    createDependencyReleaseContexts(dependency, releaseContext, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      callback(error);\n    });\n  }, context);\n}\n\nfunction checkReleaseContextCreated(releaseContext, dependency, context) {\n  const releaseContextCreated = (releaseContext !== null);\n\n  if (!releaseContextCreated) {\n    const { log } = context,\n          dependencyName = dependency.getName(),\n          releaseName = dependencyName; ///\n\n    log.warning(`The '${releaseName}' context could not be created. Perhaps the 'meta.json' file is missing or invalid. Or there could be a dependency mismatch.`);\n  }\n\n  return releaseContextCreated;\n}\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n            ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.warning(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\n}\n\nfunction checkReleaseMatchesDependency(releaseContext, dependency, dependentNames, context) {\n  let releaseMatchesDependency = true;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      const { log } = context,\n            version = releaseContext.getVersion(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            versionString = version.toString(),\n            dependencyString = dependency.asString();\n\n      log.warning(`Version mismatch: The '${dependentName}' dependent requires the '${dependencyString}' dependency but a context with version '${versionString}' was provided.`);\n\n      releaseMatchesDependency = false;\n    }\n  }\n\n  return releaseMatchesDependency;\n}\n\nfunction createDependencyReleaseContexts(dependency, releaseContext, dependentNames, context, callback) {\n  const dependencyName = dependency.getName(),\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, () => {\n    const error = null;\n\n    callback(error);\n  });\n}\n"],"names":["createReleaseContext","dependency","dependentNames","context","callback","log","releaseContextMap","dependencyName","getName","dependencyString","asString","releaseName","releaseContext","debug","error","releaseContextFromDependency","releaseContextCreated","checkReleaseContextCreated","releaseMatchesDependency","checkReleaseMatchesDependency","info","createDependencyReleaseContexts","warning","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","version","getVersion","lastDependentName","last","dependentName","versionString","toString","dependencies","getDependencies","asynchronousForEachDependency","next","done"],"mappings":"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"}
|
|
@@ -128,7 +128,7 @@ _define_property(StatementAsCombinatorVerifier, "maps", [
|
|
|
128
128
|
{
|
|
129
129
|
nodeQuery: statementNodeQuery,
|
|
130
130
|
verify: function(statementNode, fileContext) {
|
|
131
|
-
var verifyStatement = _shim.default.verifyStatement, derived =
|
|
131
|
+
var verifyStatement = _shim.default.verifyStatement, derived = true, assignments = null, localContext = _local.default.fromFileContext(fileContext), statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
|
|
132
132
|
return statementVerified;
|
|
133
133
|
}
|
|
134
134
|
},
|
|
@@ -153,4 +153,4 @@ _define_property(StatementAsCombinatorVerifier, "maps", [
|
|
|
153
153
|
var statementAsCombinatorVerifier = new StatementAsCombinatorVerifier();
|
|
154
154
|
var _default = statementAsCombinatorVerifier;
|
|
155
155
|
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9zdGF0ZW1lbnRBc0NvbWJpbmF0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5pbXBvcnQgdmVyaWZ5VHlwZSBmcm9tIFwiLi4vdmVyaWZ5L3R5cGVcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IExvY2FsQ29udGV4dCBmcm9tIFwiLi4vY29udGV4dC9sb2NhbFwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpLFxuICAgICAgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90eXBlIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQhXCIpO1xuXG5jbGFzcyBTdGF0ZW1lbnRBc0NvbWJpbmF0b3JWZXJpZmllciBleHRlbmRzIFZlcmlmaWVyIHtcbiAgdmVyaWZ5U3RhdGVtZW50KHN0YXRlbWVudE5vZGUsIGZpbGVDb250ZXh0KSB7XG4gICAgbGV0IHN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yO1xuXG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gc3RhdGVtZW50Tm9kZSwgLy8vXG4gICAgICAgICAgY2hpbGROb2RlcyA9IG5vblRlcm1pbmFsTm9kZS5nZXRDaGlsZE5vZGVzKCksXG4gICAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGhpcy52ZXJpZnlDaGlsZE5vZGVzKGNoaWxkTm9kZXMsIGZpbGVDb250ZXh0KTtcblxuICAgIHN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yID0gY2hpbGROb2Rlc1ZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gc3RhdGVtZW50VmVyaWZpZWRBc0NvbWJpbmF0b3I7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHN0YXRlbWVudE5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHN0YXRlbWVudE5vZGUsIGZpbGVDb250ZXh0KSA9PiB7XG4gICAgICAgIGNvbnN0IHsgdmVyaWZ5U3RhdGVtZW50IH0gPSBzaGltLFxuICAgICAgICAgICAgICBkZXJpdmVkID0gdHJ1ZSwgLy8vXG4gICAgICAgICAgICAgIGFzc2lnbm1lbnRzID0gbnVsbCxcbiAgICAgICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5U3RhdGVtZW50KHN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBkZXJpdmVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdGVybU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHRlcm1Ob2RlLCBmaWxlQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IHZlcmlmeVRlcm0gfSA9IHNoaW0sXG4gICAgICAgICAgICAgIHRlcm1zID0gW10sXG4gICAgICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWQgPSB2ZXJpZnlUZXJtKHRlcm1Ob2RlLCB0ZXJtcywgbG9jYWxDb250ZXh0LCAoKSA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG5cbiAgICAgICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICAgICAgfSk7XG5cbiAgICAgICAgcmV0dXJuIHRlcm1WZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdHlwZU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHR5cGVOb2RlLCBsb2NhbENvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgdHlwZVZlcmlmaWVkID0gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICByZXR1cm4gdHlwZVZlcmlmaWVkO1xuICAgICAgfVxuICAgIH1cbiAgXTtcbn1cblxuY29uc3Qgc3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXIgPSBuZXcgU3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXIoKTtcblxuZXhwb3J0IGRlZmF1bHQgc3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXI7XG4iXSwibmFtZXMiOlsidGVybU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInR5cGVOb2RlUXVlcnkiLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJTdGF0ZW1lbnRBc0NvbWJpbmF0b3JWZXJpZmllciIsInZlcmlmeVN0YXRlbWVudCIsInN0YXRlbWVudE5vZGUiLCJmaWxlQ29udGV4dCIsInN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ2ZXJpZnlDaGlsZE5vZGVzIiwiVmVyaWZpZXIiLCJtYXBzIiwidmVyaWZ5Iiwic2hpbSIsImRlcml2ZWQiLCJhc3NpZ25tZW50cyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN0YXRlbWVudFZlcmlmaWVkIiwidGVybU5vZGUiLCJ2ZXJpZnlUZXJtIiwidGVybXMiLCJ0ZXJtVmVyaWZpZWQiLCJ2ZXJpZmllZEFoZWFkIiwidHlwZU5vZGUiLCJ0eXBlVmVyaWZpZWQiLCJ2ZXJpZnlUeXBlIiwic3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQW1FQTs7O2VBQUE7OzsyREFqRWlCOytEQUNJOzJEQUNFO3FCQUVHOzREQUNEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUV6QixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsV0FDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkUscUJBQXFCRixJQUFBQSxnQkFBUyxFQUFDO0FBRXJDLElBQUEsQUFBTUcsOENBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO2lDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsZ0JBQWdCQyxhQUFhLEVBQUVDLFdBQVc7Z0JBQ3hDLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkgsZUFDbEJJLGFBQWFELGdCQUFnQkUsYUFBYSxJQUMxQ0MscUJBQXFCLElBQUksQ0FBQ0MsZ0JBQWdCLENBQUNILFlBQVlIO2dCQUU3REMsZ0NBQWdDSSxvQkFBcUIsR0FBRztnQkFFeEQsT0FBT0o7WUFDVDs7O1dBWElKO0VBQXNDVSxpQkFBUTtBQWFsRCxpQkFiSVYsK0JBYUdXLFFBQU87SUFDWjtRQUNFZCxXQUFXRTtRQUNYYSxRQUFRLFNBQUNWLGVBQWVDO1lBQ3RCLElBQU0sQUFBRUYsa0JBQW9CWSxhQUFJLENBQXhCWixpQkFDRmEsVUFBVSxNQUNWQyxjQUFjLE1BQ2RDLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDZixjQUM1Q2dCLG9CQUFvQmxCLGdCQUFnQkMsZUFBZWEsYUFBYUQsU0FBU0U7WUFFL0UsT0FBT0c7UUFDVDtJQUNGO0lBQ0E7UUFDRXRCLFdBQVdEO1FBQ1hnQixRQUFRLFNBQUNRLFVBQVVqQjtZQUNqQixJQUFNLEFBQUVrQixhQUFlUixhQUFJLENBQW5CUSxZQUNGQyxRQUFRLEVBQUUsRUFDVk4sZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNmLGNBQzVDb0IsZUFBZUYsV0FBV0QsVUFBVUUsT0FBT04sY0FBYztnQkFDdkQsSUFBTVEsZ0JBQWdCO2dCQUV0QixPQUFPQTtZQUNUO1lBRU4sT0FBT0Q7UUFDVDtJQUNGO0lBQ0E7UUFDRTFCLFdBQVdDO1FBQ1hjLFFBQVEsU0FBQ2EsVUFBVVQ7WUFDakIsSUFBTVUsZUFBZUMsSUFBQUEsYUFBVSxFQUFDRixVQUFVVDtZQUUxQyxPQUFPVTtRQUNUO0lBQ0Y7Q0FDRDtBQUdILElBQU1FLGdDQUFnQyxJQUFJNUI7SUFFMUMsV0FBZTRCIn0=
|
package/lib/verify/proofStep.js
CHANGED
|
@@ -14,7 +14,6 @@ var _subproof = /*#__PURE__*/ _interop_require_default(require("../verify/subpro
|
|
|
14
14
|
var _qualified = /*#__PURE__*/ _interop_require_default(require("../verify/statement/qualified"));
|
|
15
15
|
var _unqualified = /*#__PURE__*/ _interop_require_default(require("../verify/statement/unqualified"));
|
|
16
16
|
var _query = require("../utilities/query");
|
|
17
|
-
var _assignments = require("../utilities/assignments");
|
|
18
17
|
function _interop_require_default(obj) {
|
|
19
18
|
return obj && obj.__esModule ? obj : {
|
|
20
19
|
default: obj
|
|
@@ -32,22 +31,20 @@ function verifyProofStep(proofStepNode, substitutions, localContext) {
|
|
|
32
31
|
proofStep = _proofStep.default.fromSubproofNode(subproofNode);
|
|
33
32
|
}
|
|
34
33
|
} else {
|
|
35
|
-
var derived = true, assignments =
|
|
36
|
-
var statementVerified = false;
|
|
34
|
+
var derived = true, assignments = null;
|
|
37
35
|
if (qualifiedStatementNode !== null) {
|
|
38
36
|
var qualifiedStatementVerified = (0, _qualified.default)(qualifiedStatementNode, substitutions, assignments, derived, localContext);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
37
|
+
if (qualifiedStatementVerified) {
|
|
38
|
+
var statementNode = statementNodeQuery(qualifiedStatementNode);
|
|
39
|
+
proofStep = _proofStep.default.fromStatementNode(statementNode);
|
|
40
|
+
}
|
|
42
41
|
}
|
|
43
42
|
if (unqualifiedStatementNode !== null) {
|
|
44
43
|
var unqualifiedStatementVerified = (0, _unqualified.default)(unqualifiedStatementNode, assignments, derived, localContext);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (statementVerified) {
|
|
50
|
-
(0, _assignments.assignAssignments)(assignments, localContext);
|
|
44
|
+
if (unqualifiedStatementVerified) {
|
|
45
|
+
var statementNode1 = statementNodeQuery(unqualifiedStatementNode);
|
|
46
|
+
proofStep = _proofStep.default.fromStatementNode(statementNode1);
|
|
47
|
+
}
|
|
51
48
|
}
|
|
52
49
|
}
|
|
53
50
|
if (proofStep !== null) {
|
|
@@ -60,4 +57,4 @@ Object.assign(_shim.default, {
|
|
|
60
57
|
verifyProofStep: verifyProofStep
|
|
61
58
|
});
|
|
62
59
|
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJvb2ZTdGVwLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi4vc2hpbVwiO1xuaW1wb3J0IFByb29mU3RlcCBmcm9tIFwiLi4vcHJvb2ZTdGVwXCI7XG5pbXBvcnQgdmVyaWZ5U3VicHJvb2YgZnJvbSBcIi4uL3ZlcmlmeS9zdWJwcm9vZlwiO1xuaW1wb3J0IHZlcmlmeVF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudC9xdWFsaWZpZWRcIjtcbmltcG9ydCB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudC91bnF1YWxpZmllZFwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHN1YnByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Byb29mU3RlcHxsYXN0UHJvb2ZTdGVwL3N1YnByb29mIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9xdWFsaWZpZWRTdGF0ZW1lbnR8dW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKSxcbiAgICAgIHF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9wcm9vZlN0ZXB8bGFzdFByb29mU3RlcC9xdWFsaWZpZWRTdGF0ZW1lbnQhXCIpLFxuICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcHJvb2ZTdGVwfGxhc3RQcm9vZlN0ZXAvdW5xdWFsaWZpZWRTdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlQcm9vZlN0ZXAocHJvb2ZTdGVwTm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBwcm9vZlN0ZXBWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IHN1YnByb29mTm9kZSA9IHN1YnByb29mTm9kZVF1ZXJ5KHByb29mU3RlcE5vZGUpLFxuICAgICAgICBxdWFsaWZpZWRTdGF0ZW1lbnROb2RlID0gcXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5KHByb29mU3RlcE5vZGUpLFxuICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeShwcm9vZlN0ZXBOb2RlKTtcblxuICBsZXQgcHJvb2ZTdGVwID0gbnVsbDtcblxuICBpZiAoc3VicHJvb2ZOb2RlICE9PSBudWxsKSB7XG4gICAgbGV0IHN1YnByb29mVmVyaWZpZWQ7XG5cbiAgICBzdWJwcm9vZlZlcmlmaWVkID0gdmVyaWZ5U3VicHJvb2Yoc3VicHJvb2ZOb2RlLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHQpO1xuXG4gICAgaWYgKHN1YnByb29mVmVyaWZpZWQpIHtcbiAgICAgIHByb29mU3RlcCA9IFByb29mU3RlcC5mcm9tU3VicHJvb2ZOb2RlKHN1YnByb29mTm9kZSk7XG4gICAgfVxuICB9IGVsc2Uge1xuICAgIGNvbnN0IGRlcml2ZWQgPSB0cnVlLFxuICAgICAgICAgIGFzc2lnbm1lbnRzID0gbnVsbDtcblxuICAgIGlmIChxdWFsaWZpZWRTdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBxdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCA9IHZlcmlmeVF1YWxpZmllZFN0YXRlbWVudChxdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBzdWJzdGl0dXRpb25zLCBhc3NpZ25tZW50cywgZGVyaXZlZCwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgaWYgKHF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgICAgIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlUXVlcnkocXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgICAgcHJvb2ZTdGVwID0gUHJvb2ZTdGVwLmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBkZXJpdmVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAodW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZVF1ZXJ5KHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgICAgcHJvb2ZTdGVwID0gUHJvb2ZTdGVwLmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGlmIChwcm9vZlN0ZXAgIT09IG51bGwpIHtcbiAgICBsb2NhbENvbnRleHQuYWRkUHJvb2ZTdGVwKHByb29mU3RlcCk7XG5cbiAgICBwcm9vZlN0ZXBWZXJpZmllZCA9IHRydWU7XG4gIH1cblxuICByZXR1cm4gcHJvb2ZTdGVwVmVyaWZpZWQ7XG59XG5cbk9iamVjdC5hc3NpZ24oc2hpbSwge1xuICB2ZXJpZnlQcm9vZlN0ZXBcbn0pO1xuIl0sIm5hbWVzIjpbInZlcmlmeVByb29mU3RlcCIsInN1YnByb29mTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5IiwicXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkiLCJwcm9vZlN0ZXBOb2RlIiwic3Vic3RpdHV0aW9ucyIsImxvY2FsQ29udGV4dCIsInByb29mU3RlcFZlcmlmaWVkIiwic3VicHJvb2ZOb2RlIiwicXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInByb29mU3RlcCIsInN1YnByb29mVmVyaWZpZWQiLCJ2ZXJpZnlTdWJwcm9vZiIsIlByb29mU3RlcCIsImZyb21TdWJwcm9vZk5vZGUiLCJkZXJpdmVkIiwiYXNzaWdubWVudHMiLCJxdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCIsInZlcmlmeVF1YWxpZmllZFN0YXRlbWVudCIsInN0YXRlbWVudE5vZGUiLCJmcm9tU3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCIsImFkZFByb29mU3RlcCIsIk9iamVjdCIsImFzc2lnbiIsInNoaW0iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWVBOzs7ZUFBd0JBOzs7MkRBYlA7Z0VBQ0s7K0RBQ0s7Z0VBQ1U7a0VBQ0U7cUJBRWI7Ozs7OztBQUUxQixJQUFNQyxvQkFBb0JDLElBQUFBLGdCQUFTLEVBQUMsdUNBQzlCQyxxQkFBcUJELElBQUFBLGdCQUFTLEVBQUMsd0RBQy9CRSw4QkFBOEJGLElBQUFBLGdCQUFTLEVBQUMsaURBQ3hDRyxnQ0FBZ0NILElBQUFBLGdCQUFTLEVBQUM7QUFFakMsU0FBU0YsZ0JBQWdCTSxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsWUFBWTtJQUNoRixJQUFJQyxvQkFBb0I7SUFFeEIsSUFBTUMsZUFBZVQsa0JBQWtCSyxnQkFDakNLLHlCQUF5QlAsNEJBQTRCRSxnQkFDckRNLDJCQUEyQlAsOEJBQThCQztJQUUvRCxJQUFJTyxZQUFZO0lBRWhCLElBQUlILGlCQUFpQixNQUFNO1FBQ3pCLElBQUlJO1FBRUpBLG1CQUFtQkMsSUFBQUEsaUJBQWMsRUFBQ0wsY0FBY0gsZUFBZUM7UUFFL0QsSUFBSU0sa0JBQWtCO1lBQ3BCRCxZQUFZRyxrQkFBUyxDQUFDQyxnQkFBZ0IsQ0FBQ1A7UUFDekM7SUFDRixPQUFPO1FBQ0wsSUFBTVEsVUFBVSxNQUNWQyxjQUFjO1FBRXBCLElBQUlSLDJCQUEyQixNQUFNO1lBQ25DLElBQU1TLDZCQUE2QkMsSUFBQUEsa0JBQXdCLEVBQUNWLHdCQUF3QkosZUFBZVksYUFBYUQsU0FBU1Y7WUFFekgsSUFBSVksNEJBQTRCO2dCQUM5QixJQUFNRSxnQkFBZ0JuQixtQkFBbUJRO2dCQUV6Q0UsWUFBWUcsa0JBQVMsQ0FBQ08saUJBQWlCLENBQUNEO1lBQzFDO1FBQ0Y7UUFFQSxJQUFJViw2QkFBNkIsTUFBTTtZQUNyQyxJQUFNWSwrQkFBK0JDLElBQUFBLG9CQUEwQixFQUFDYiwwQkFBMEJPLGFBQWFELFNBQVNWO1lBRWhILElBQUlnQiw4QkFBOEI7Z0JBQ2hDLElBQU1GLGlCQUFnQm5CLG1CQUFtQlM7Z0JBRXpDQyxZQUFZRyxrQkFBUyxDQUFDTyxpQkFBaUIsQ0FBQ0Q7WUFDMUM7UUFDRjtJQUNGO0lBRUEsSUFBSVQsY0FBYyxNQUFNO1FBQ3RCTCxhQUFha0IsWUFBWSxDQUFDYjtRQUUxQkosb0JBQW9CO0lBQ3RCO0lBRUEsT0FBT0E7QUFDVDtBQUVBa0IsT0FBT0MsTUFBTSxDQUFDQyxhQUFJLEVBQUU7SUFDbEI3QixpQkFBQUE7QUFDRiJ9
|
package/package.json
CHANGED
|
@@ -74,7 +74,7 @@ function checkReleaseContextCreated(releaseContext, dependency, context) {
|
|
|
74
74
|
dependencyName = dependency.getName(),
|
|
75
75
|
releaseName = dependencyName; ///
|
|
76
76
|
|
|
77
|
-
log.
|
|
77
|
+
log.warning(`The '${releaseName}' context could not be created. Perhaps the 'meta.json' file is missing or invalid. Or there could be a dependency mismatch.`);
|
|
78
78
|
}
|
|
79
79
|
|
|
80
80
|
return releaseContextCreated;
|
|
@@ -94,7 +94,7 @@ function checkCyclicDependencyExists(dependency, dependentNames, context) {
|
|
|
94
94
|
],
|
|
95
95
|
dependencyNamesString = dependencyNames.join(`' -> '`);
|
|
96
96
|
|
|
97
|
-
log.
|
|
97
|
+
log.warning(`There is a cyclic dependency: '${dependencyNamesString}'.`);
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
return cyclicDependencyExists;
|
|
@@ -29,8 +29,8 @@ class StatementAsCombinatorVerifier extends Verifier {
|
|
|
29
29
|
nodeQuery: statementNodeQuery,
|
|
30
30
|
verify: (statementNode, fileContext) => {
|
|
31
31
|
const { verifyStatement } = shim,
|
|
32
|
-
derived =
|
|
33
|
-
assignments =
|
|
32
|
+
derived = true, ///
|
|
33
|
+
assignments = null,
|
|
34
34
|
localContext = LocalContext.fromFileContext(fileContext),
|
|
35
35
|
statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
|
|
36
36
|
|
package/src/verify/proofStep.js
CHANGED
|
@@ -7,7 +7,6 @@ import verifyQualifiedStatement from "../verify/statement/qualified";
|
|
|
7
7
|
import verifyUnqualifiedStatement from "../verify/statement/unqualified";
|
|
8
8
|
|
|
9
9
|
import { nodeQuery } from "../utilities/query";
|
|
10
|
-
import { assignAssignments } from "../utilities/assignments";
|
|
11
10
|
|
|
12
11
|
const subproofNodeQuery = nodeQuery("/proofStep|lastProofStep/subproof!"),
|
|
13
12
|
statementNodeQuery = nodeQuery("/qualifiedStatement|unqualifiedStatement/statement!"),
|
|
@@ -33,32 +32,26 @@ export default function verifyProofStep(proofStepNode, substitutions, localConte
|
|
|
33
32
|
}
|
|
34
33
|
} else {
|
|
35
34
|
const derived = true,
|
|
36
|
-
assignments =
|
|
37
|
-
|
|
38
|
-
let statementVerified = false;
|
|
35
|
+
assignments = null;
|
|
39
36
|
|
|
40
37
|
if (qualifiedStatementNode !== null) {
|
|
41
38
|
const qualifiedStatementVerified = verifyQualifiedStatement(qualifiedStatementNode, substitutions, assignments, derived, localContext);
|
|
42
39
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
proofStep = ProofStep.fromStatementNode(statementNode);
|
|
40
|
+
if (qualifiedStatementVerified) {
|
|
41
|
+
const statementNode = statementNodeQuery(qualifiedStatementNode);
|
|
46
42
|
|
|
47
|
-
|
|
43
|
+
proofStep = ProofStep.fromStatementNode(statementNode);
|
|
44
|
+
}
|
|
48
45
|
}
|
|
49
46
|
|
|
50
47
|
if (unqualifiedStatementNode !== null) {
|
|
51
48
|
const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, assignments, derived, localContext);
|
|
52
49
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
proofStep = ProofStep.fromStatementNode(statementNode);
|
|
56
|
-
|
|
57
|
-
statementVerified = unqualifiedStatementVerified; ///
|
|
58
|
-
}
|
|
50
|
+
if (unqualifiedStatementVerified) {
|
|
51
|
+
const statementNode = statementNodeQuery(unqualifiedStatementNode);
|
|
59
52
|
|
|
60
|
-
|
|
61
|
-
|
|
53
|
+
proofStep = ProofStep.fromStatementNode(statementNode);
|
|
54
|
+
}
|
|
62
55
|
}
|
|
63
56
|
}
|
|
64
57
|
|