Skip to content

update: use utils package #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VsevolodX merged 2 commits into from
Sep 20, 2025
Merged

update: use utils package #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a603b2c
update: use utils package
VsevolodX Sep 20, 2025
a03adce
chore: remove node 14
VsevolodX Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
strategy:
matrix:
node-version:
- 14.x
- 20.x

steps:
Expand Down Expand Up @@ -57,4 +56,3 @@ jobs:
with:
npm-token: ${{ secrets.NPM_TOKEN }}
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

4 changes: 2 additions & 2 deletions dist/js/context/ContextProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exports.ContextProviderName = void 0;
* to next one, for example data about material to track when it is changed.
* @notes Should hold static data only (see `setData` method), no classes or functions
*/
const utils_1 = require("@mat3ra/code/dist/js/utils");
const utils_1 = require("@mat3ra/utils");
const lodash_1 = __importDefault(require("lodash"));
// TODO: separate application-specific CPs
var ContextProviderName;
Expand Down Expand Up @@ -90,7 +90,7 @@ class ContextProvider {
return this.isEdited ? this.data : this.defaultData;
}
setData(data) {
this.data = (0, utils_1.deepClone)(data);
this.data = utils_1.Utils.clone.deepClone(data);
}
// override in children
// eslint-disable-next-line class-methods-use-this
Expand Down
4 changes: 2 additions & 2 deletions dist/js/templateMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.templateMixin = templateMixin;
exports.templateStaticMixin = templateStaticMixin;
const utils_1 = require("@mat3ra/code/dist/js/utils");
const utils_1 = require("@mat3ra/utils");
const JSONSchemasInterface_1 = __importDefault(require("@mat3ra/esse/dist/js/esse/JSONSchemasInterface"));
const nunjucks_1 = __importDefault(require("nunjucks"));
const ContextProviderRegistryContainer_1 = __importDefault(require("./context/ContextProviderRegistryContainer"));
Expand Down Expand Up @@ -73,7 +73,7 @@ function templateMixin(item) {
_cleanRenderingContext(object) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { job, ...clone } = object;
return (0, utils_1.deepClone)(clone);
return utils_1.Utils.clone.deepClone(clone);
},
/*
* @summary Initializes context provider class instances. `providerContext` is used to pass the data about any
Expand Down
604 changes: 218 additions & 386 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@
},
"peerDependencies": {
"@exabyte-io/application-flavors.js": "*",
"@mat3ra/utils": "*",
"@mat3ra/code": "*",
"@mat3ra/esse": "*",
"@mat3ra/made": "*"
},
"engines": {
"node": ">=12.0.0"
"node": ">=20.0.0"
},
"lint-staged": {
"*.js": "eslint --cache --fix",
Expand Down
4 changes: 2 additions & 2 deletions src/js/context/ContextProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* to next one, for example data about material to track when it is changed.
* @notes Should hold static data only (see `setData` method), no classes or functions
*/
import { deepClone } from "@mat3ra/code/dist/js/utils";
import { Utils } from "@mat3ra/utils";
import lodash from "lodash";

export interface ContextProviderInstance {
Expand Down Expand Up @@ -131,7 +131,7 @@ export default class ContextProvider {
}

setData(data: object) {
this.data = deepClone(data);
this.data = Utils.clone.deepClone(data);
}

// override in children
Expand Down
4 changes: 2 additions & 2 deletions src/js/templateMixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
import { deepClone } from "@mat3ra/code/dist/js/utils";
import { Utils } from "@mat3ra/utils";
import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
import JSONSchemasInterface from "@mat3ra/esse/dist/js/esse/JSONSchemasInterface";
import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
Expand Down Expand Up @@ -121,7 +121,7 @@ export function templateMixin(item: TemplateBase) {
_cleanRenderingContext(object: Record<string, unknown>) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { job, ...clone } = object;
return deepClone(clone);
return Utils.clone.deepClone(clone);
},

/*
Expand Down