Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,700 changes: 1,441 additions & 259 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions packages/compas-open-scd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"module": "open-scd.js",
"type": "module",
"dependencies": {
"@compas-oscd/core": "^0.1.4",
"@compas-oscd/xml": "^0.0.1",
"@material/mwc-dialog": "0.22.1",
"@material/mwc-drawer": "0.22.1",
"@material/mwc-fab": "0.22.1",
Expand All @@ -36,17 +38,16 @@
"@material/mwc-textarea": "0.22.1",
"@material/mwc-textfield": "0.22.1",
"@material/mwc-top-app-bar-fixed": "0.22.1",
"@openscd/addons": "*",
"@openscd/open-scd": "*",
"@openscd/plugins": "*",
"ace-custom-element": "^1.6.5",
"csv-stringify": "^6.2.0",
"lit-element": "2.5.1",
"lit-html": "1.4.1",
"lit-translate": "^1.2.1",
"marked": "^4.0.10",
"panzoom": "^9.4.2",
"@compas-oscd/xml": "^0.0.1",
"@openscd/open-scd": "*",
"@openscd/plugins": "*",
"@openscd/addons": "*"
"panzoom": "^9.4.2"
},
"scripts": {
"lint:eslint": "eslint --ext .ts,.html . --ignore-path .gitignore",
Expand All @@ -62,7 +63,7 @@
"test:unit": "web-test-runner --watch --group unit",
"test:integration": "web-test-runner --watch --group integration",
"doc:clean": "npx rimraf doc",
"doc:typedoc": "typedoc --plugin none --out doc src",
"doc:typedoc": "typedoc --skipErrorChecking --entryPointStrategy expand --out doc src",
"doc:wca": "wca src --outDir doc/components",
"doc": "npm run doc:clean && npm run doc:typedoc && npm run doc:wca",
"release": "standard-version",
Expand Down Expand Up @@ -104,9 +105,9 @@
"source-map": "^0.7.4",
"standard-version": "^9.3.1",
"tslib": "^2.3.1",
"typedoc": "^0.21.10",
"typedoc": "^0.25.0",
"typedoc-plugin-markdown": "3.10.4",
"typescript": "4.3.5",
"typescript": "4.9.5",
"web-component-analyzer": "^1.1.6",
"workbox-cli": "^6.2.4"
},
Expand Down
32 changes: 14 additions & 18 deletions packages/compas-open-scd/src/addons/CompasHistory.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import {
html,
TemplateResult,
customElement,
} from 'lit-element';
import { html, TemplateResult, customElement } from 'lit-element';

import '@material/mwc-button';
import '@material/mwc-dialog';
Expand All @@ -15,11 +11,12 @@ import '@material/mwc-snackbar';

import '@openscd/open-scd/src/filtered-list.js';

import {
IssueDetail,
} from '@openscd/core/foundation/deprecated/history.js';
import { IssueDetail } from '@compas-oscd/core/foundation/deprecated/history.js';

import { HistoryUIDetail, OscdHistory } from '@openscd/open-scd/src/addons/History.js';
import {
HistoryUIDetail,
OscdHistory,
} from '@openscd/open-scd/src/addons/History.js';
import { wizards } from '@openscd/plugins/src/wizards/wizard-library';
import { newWizardEvent, SCLTag } from '@openscd/open-scd/src/foundation';
import { nothing } from 'lit-html';
Expand Down Expand Up @@ -100,16 +97,15 @@ export class CompasHistory extends OscdHistory {
<span> ${issue.title}</span>
<span slot="secondary">${issue.message}</span>
${this.hasEditWizard(issue.element)
? html` <span slot="meta">
<mwc-icon-button
icon="edit"
@click=${() => this.openEditWizard(issue.element)}
></mwc-icon-button>
</span>`
: nothing}
? html` <span slot="meta">
<mwc-icon-button
icon="edit"
@click=${() => this.openEditWizard(issue.element)}
></mwc-icon-button>
</span>`
: nothing}
</mwc-list-item>
</abbr
>`;
</abbr>`;
}
}

Expand Down
11 changes: 4 additions & 7 deletions packages/compas-open-scd/src/compas-editors/CompasVersions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';

import '@openscd/open-scd/src/plain-compare-list.js';

import { newLogEvent } from "@openscd/core/foundation/deprecated/history.js";
import { newOpenDocEvent } from "@openscd/core/foundation/deprecated/open-event.js";
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';

import {
newWizardEvent,
Wizard,
} from '@openscd/open-scd/src/foundation.js';
import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';

import {
CompasSclDataService,
Expand All @@ -43,7 +40,7 @@ import {
} from '../compas/foundation.js';
import { addVersionToCompasWizard } from '../compas/CompasUploadVersion.js';
import { getElementByName, styles } from './foundation.js';
import { editCompasSCLWizard } from "../compas-wizards/scl.js";
import { editCompasSCLWizard } from '../compas-wizards/scl.js';

/** An editor [[`plugin`]] for selecting the `Substation` section. */
export default class CompasVersionsPlugin extends LitElement {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { LitElement, property } from 'lit-element';
import {
newActionEvent,
} from '@openscd/core/foundation/deprecated/editor.js';
import { newActionEvent } from '@compas-oscd/core/foundation/deprecated/editor.js';
import { createElement } from '@compas-oscd/xml';
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
import { get } from 'lit-translate';

let cbNum = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ import '@material/mwc-icon-button';
import { IconButton } from '@material/mwc-icon-button';

import { isPublic } from '@openscd/open-scd/src/foundation.js';
import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
import { newActionEvent } from '@compas-oscd/core/foundation/deprecated/editor.js';
import { createElement } from '@compas-oscd/xml';
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';

import { ComplexAction, SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
import {
ComplexAction,
SimpleAction,
} from '@compas-oscd/core/foundation/deprecated/editor.js';

import '@openscd/open-scd/src/action-pane.js';
import '@openscd/open-scd/src/action-icon.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
import {
APPLICATION_ERROR,
extractErrorMessage,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { get } from 'lit-translate';
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';

export const NOT_FOUND_ERROR = 'NotFoundError';
export const APPLICATION_ERROR = 'ApplicationError';
Expand Down
5 changes: 4 additions & 1 deletion packages/compas-open-scd/src/compas-wizards/scl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import {

import { cloneElement } from '@compas-oscd/xml';

import { ComplexAction, EditorAction } from "@openscd/core/foundation/deprecated/editor.js";
import {
ComplexAction,
EditorAction,
} from '@compas-oscd/core/foundation/deprecated/editor.js';

import '../compas/CompasLabelsField.js';

Expand Down
4 changes: 2 additions & 2 deletions packages/compas-open-scd/src/compas/CompasAutoAlignment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import '@material/mwc-list';
import '@material/mwc-list/mwc-check-list-item';

import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';

import { CompasSclAutoAlignmentService } from '../compas-services/CompasSclAutoAlignmentService.js';
import { createLogEvent } from '../compas-services/foundation.js';
Expand Down
8 changes: 3 additions & 5 deletions packages/compas-open-scd/src/compas/CompasImportFromApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import { customElement, html, LitElement, TemplateResult } from 'lit-element';

import '@material/mwc-list/mwc-list-item';

import {
newWizardEvent,
} from '@openscd/open-scd/src/foundation.js';
import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';

import '@openscd/open-scd/src/filtered-list.js';

Expand Down
4 changes: 1 addition & 3 deletions packages/compas-open-scd/src/compas/CompasNsdoc.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@


import {
createLogEvent,
createNSDocLogEvent,
} from '../compas-services/foundation.js';
import { CompasNSDocFileService } from '../compas-services/CompasNSDocFileService.js';
import { newLoadNsdocEvent } from '@openscd/core/foundation/deprecated/settings.js';
import { newLoadNsdocEvent } from '@compas-oscd/core/foundation/deprecated/settings.js';

interface NsdocFileResponse {
id: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/compas/CompasOpen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { translate } from 'lit-translate';

import '@material/mwc-button';

import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';

import { CompasSclDataService } from '../compas-services/CompasSclDataService.js';
import { createLogEvent } from '../compas-services/foundation.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/compas-open-scd/src/compas/CompasSave.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base';
import '@material/mwc-textfield';
import '@material/mwc-button';

import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
import { saveDocumentToFile } from '../file.js';

import '@openscd/open-scd/src/WizardDivider.js';
Expand Down
4 changes: 2 additions & 2 deletions packages/compas-open-scd/src/compas/CompasUploadVersion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
Wizard,
WizardInputElement,
} from '@openscd/open-scd/src/foundation.js';
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';

import '@openscd/open-scd/src/wizard-textfield.js';

Expand Down
4 changes: 2 additions & 2 deletions packages/compas-open-scd/src/compas/foundation.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { get } from 'lit-translate';

import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
import {
COMPAS_SCL_PRIVATE_TYPE,
getCompasSclFileType,
Expand Down
Loading
Loading