Skip to content

Commit

Permalink
Merge pull request #605 from accordproject/ertugrul/update-concerto-d…
Browse files Browse the repository at this point in the history
…ependencies

chore(deps): update concerto dependencies
  • Loading branch information
ekarademir authored Jun 14, 2024
2 parents 9f3fec0 + 5fda9e8 commit b21a6f3
Show file tree
Hide file tree
Showing 18 changed files with 1,193 additions and 427 deletions.
1,353 changes: 956 additions & 397 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@accordproject/concerto-core": "3.9.1",
"@accordproject/concerto-core": "3.16.9",
"browserify-zlib": "^0.2.0",
"colors": "1.4.0",
"coveralls": "3.0.4",
Expand Down
10 changes: 6 additions & 4 deletions packages/markdown-cicero/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ module.exports = {
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},
moduleNameMapper: {
'^axios$': 'axios/dist/axios.js'
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
Expand Down Expand Up @@ -179,18 +181,18 @@ module.exports = {
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: null,
// transform: {},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/"
// 'node_modules'
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: null,
verbose: true,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-cicero/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"nyc": "15.1.0"
},
"dependencies": {
"@accordproject/concerto-core": "3.9.1",
"@accordproject/concerto-core": "3.16.9",
"@accordproject/markdown-common": "*",
"@accordproject/markdown-it-cicero": "*",
"markdown-it": "^13.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"tsd-jsdoc": "^2.3.0"
},
"dependencies": {
"@accordproject/concerto-util": "3.9.1",
"@accordproject/concerto-util": "3.16.9",
"@accordproject/markdown-transform": "*",
"jsome": "2.5.0",
"winston": "3.2.1",
Expand Down
4 changes: 3 additions & 1 deletion packages/markdown-common/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ module.exports = {
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},
moduleNameMapper: {
'^axios$': 'axios/dist/axios.js'
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"nyc": "15.1.0"
},
"dependencies": {
"@accordproject/concerto-core": "3.9.1",
"@accordproject/concerto-core": "3.16.9",
"@xmldom/xmldom": "^0.8.1",
"markdown-it": "^13.0.1",
"winston": "3.2.1"
Expand Down
203 changes: 203 additions & 0 deletions packages/markdown-docx/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

'use strict';
// For a detailed explanation regarding each configuration property, visit:
// https://jestjs.io/docs/en/configuration.html

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// Respect "browser" field in package.json when resolving modules
// browser: false,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/tv/4ljndl3s2jg90nxd8h7f3bgr0000gn/T/jest_dx",

// Automatically clear mock calls and instances between every test
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
collectCoverageFrom: [ 'src/**/*.js' ],

// The directory where Jest should output its coverage files
coverageDirectory: 'coverage',

// An array of regexp pattern strings used to skip coverage collection
coveragePathIgnorePatterns: [
'/src/',
'/node_modules/'
],

// A list of reporter names that Jest uses when writing coverage reports
coverageReporters: [
'json',
'text',
'lcov',
'html'
],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: null,

// A path to a custom dependency extractor
// dependencyExtractor: null,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: null,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: null,

// A set of global variables that need to be available in all test environments
// globals: {},

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "json",
// "jsx",
// "ts",
// "tsx",
// "node"
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
moduleNameMapper: {
'^axios$': 'axios/dist/axios.js'
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: null,

// Run tests from one or more projects
// projects: null,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state between every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: null,

// Automatically restore mock state between every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: null,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: 'node',

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: null,

// This option allows use of a custom test runner
// testRunner: "jasmine2",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: {},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// '/node_modules/'
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: null,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};
4 changes: 3 additions & 1 deletion packages/markdown-html/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ module.exports = {
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},
moduleNameMapper: {
'^axios$': 'axios/dist/axios.js'
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
Expand Down
4 changes: 3 additions & 1 deletion packages/markdown-pdf/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ module.exports = {
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},
moduleNameMapper: {
'^axios$': 'axios/dist/axios.js'
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
Expand Down
4 changes: 3 additions & 1 deletion packages/markdown-slate/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ module.exports = {
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},
moduleNameMapper: {
'^axios$': 'axios/dist/axios.js'
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
Expand Down
6 changes: 1 addition & 5 deletions packages/markdown-template/lib/ModelVisitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

'use strict';

var util = require('util');
var {
CommonMarkModel,
TemplateMarkModel
Expand Down Expand Up @@ -47,10 +46,7 @@ class ModelVisitor {
} else if ((_thing$isEnumValue = thing.isEnumValue) !== null && _thing$isEnumValue !== void 0 && _thing$isEnumValue.call(thing)) {
return this.visitEnumValueDeclaration(thing, parameters);
} else {
throw new Error('Unrecognised type: ' + typeof thing + ', value: ' + util.inspect(thing, {
showHidden: true,
depth: 2
}));
throw new Error('Unrecognised type: ' + typeof thing + ', value: ' + thing);
}
}

Expand Down
1 change: 0 additions & 1 deletion packages/markdown-template/lib/errorutil.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ function _throwTemplateExceptionForElement(message, element) {
endColumn //XXX
}
};

throw new TemplateException(message, fileLocation, fileName, null, 'markdown-template');
}
module.exports._throwTemplateExceptionForElement = _throwTemplateExceptionForElement;
8 changes: 5 additions & 3 deletions packages/markdown-template/lib/templatemarkutil.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@

'use strict';

function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
var dayjs = require('dayjs');
var utc = require('dayjs/plugin/utc');
dayjs.extend(utc);
Expand Down
3 changes: 0 additions & 3 deletions packages/markdown-template/lib/templaterules.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ var ifCloseRule = {
}
delete node.nodes; // Delete children (now in whenTrue or whenFalse)
},

skipEmpty: false
};
var elseRule = {
Expand All @@ -125,7 +124,6 @@ var elseRule = {
node.nodes = []; // Reset children (now in whenSome)
}
},

skipEmpty: false
};
var optionalOpenRule = {
Expand Down Expand Up @@ -154,7 +152,6 @@ var optionalCloseRule = {
}
delete node.nodes; // Delete children (now in whenSome or whenNone)
},

skipEmpty: false
};
var withOpenRule = {
Expand Down
4 changes: 2 additions & 2 deletions packages/markdown-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
"webpack-cli": "4.9.1"
},
"dependencies": {
"@accordproject/concerto-core": "3.9.1",
"@accordproject/concerto-cto": "3.9.1",
"@accordproject/concerto-core": "3.16.9",
"@accordproject/concerto-cto": "3.16.9",
"@accordproject/markdown-cicero": "*",
"@accordproject/markdown-common": "*",
"@accordproject/markdown-it-template": "*",
Expand Down
Loading

0 comments on commit b21a6f3

Please sign in to comment.