From e625face346bbb9ab35f559e60e59ba73ca284eb Mon Sep 17 00:00:00 2001 From: John Haugeland Date: Sat, 16 Jan 2021 08:12:57 -0800 Subject: [PATCH] let's see if the difference is my machine or windows --- .github/workflows/nodejs.yml | 32 ++++++++++++++++++-------------- dist/es6/jssm_types.d.ts | 2 +- jssm_types.d.ts | 2 +- package-lock.json | 2 +- src/ts/jssm_types.ts | 11 ++++++++--- 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 57ebeb03..f8286c7e 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -8,22 +8,26 @@ jobs: strategy: matrix: include: - - node-version: 15.x # fastest, so run first, to error fast - os: ubuntu-latest - - node-version: 15.x # slowest, so run next. sort by slowest from here to get earliest end through parallelism - os: macos-latest + # - node-version: 15.x # fastest, so run first, to error fast + # os: ubuntu-latest + # - node-version: 15.x # slowest, so run next. sort by slowest from here to get earliest end through parallelism + # os: macos-latest - node-version: 15.x # finish check big-3 on latest current os: windows-latest - - node-version: 14.x # also check big-3 on latest lts - os: macos-latest - - node-version: 14.x - os: windows-latest - - node-version: 14.x - os: ubuntu-latest - - node-version: 10.x # lastly check just ubuntu on historic node versions because speed - os: ubuntu-latest - - node-version: 12.x - os: ubuntu-latest + # - node-version: 14.x # also check big-3 on latest lts + # os: macos-latest + # - node-version: 14.x + # os: windows-latest + # - node-version: 14.x + # os: ubuntu-latest + # - node-version: 10.x # lastly check just ubuntu on historic node versions because speed + # os: ubuntu-latest + # - node-version: 11.x + # os: ubuntu-latest + # - node-version: 12.x + # os: ubuntu-latest + # - node-version: 13.x + # os: ubuntu-latest runs-on: ${{matrix.os}} diff --git a/dist/es6/jssm_types.d.ts b/dist/es6/jssm_types.d.ts index d04c1813..bb21625c 100644 --- a/dist/es6/jssm_types.d.ts +++ b/dist/es6/jssm_types.d.ts @@ -13,7 +13,7 @@ declare type JssmResult = JssmSuccess | JssmFailure | JssmIncomplete; declare type JssmColor = string; declare type JssmPermitted = 'required' | 'disallowed'; declare type JssmPermittedOpt = 'required' | 'disallowed' | 'optional'; -declare type JssmArrow = '->' | '<->' | '<=->' | '<~->' | '=>' | '<=>' | '<-=>' | '<~=>' | '~>' | '<~>' | '<-~>' | '<=~>'; +declare type JssmArrow = '->' | '<-' | '<->' | '<=->' | '<~->' | '=>' | '<=' | '<=>' | '<-=>' | '<~=>' | '~>' | '<~' | '<~>' | '<-~>' | '<=~>'; declare type JssmShape = "box" | "polygon" | "ellipse" | "oval" | "circle" | "point" | "egg" | "triangle" | "plaintext" | "plain" | "diamond" | "trapezium" | "parallelogram" | "house" | "pentagon" | "hexagon" | "septagon" | "octagon" | "doublecircle" | "doubleoctagon" | "tripleoctagon" | "invtriangle" | "invtrapezium" | "invhouse" | "Mdiamond" | "Msquare" | "Mcircle" | "rect" | "rectangle" | "square" | "star" | "none" | "underline" | "cylinder" | "note" | "tab" | "folder" | "box3d" | "component" | "promoter" | "cds" | "terminator" | "utr" | "primersite" | "restrictionsite" | "fivepoverhang" | "threepoverhang" | "noverhang" | "assembly" | "signature" | "insulator" | "ribosite" | "rnastab" | "proteasesite" | "proteinstab" | "rpromoter" | "rarrow" | "larrow" | "lpromoter" | "record"; declare type JssmArrowDirection = 'left' | 'right' | 'both'; declare type JssmArrowKind = 'none' | 'legal' | 'main' | 'forced'; diff --git a/jssm_types.d.ts b/jssm_types.d.ts index d04c1813..bb21625c 100644 --- a/jssm_types.d.ts +++ b/jssm_types.d.ts @@ -13,7 +13,7 @@ declare type JssmResult = JssmSuccess | JssmFailure | JssmIncomplete; declare type JssmColor = string; declare type JssmPermitted = 'required' | 'disallowed'; declare type JssmPermittedOpt = 'required' | 'disallowed' | 'optional'; -declare type JssmArrow = '->' | '<->' | '<=->' | '<~->' | '=>' | '<=>' | '<-=>' | '<~=>' | '~>' | '<~>' | '<-~>' | '<=~>'; +declare type JssmArrow = '->' | '<-' | '<->' | '<=->' | '<~->' | '=>' | '<=' | '<=>' | '<-=>' | '<~=>' | '~>' | '<~' | '<~>' | '<-~>' | '<=~>'; declare type JssmShape = "box" | "polygon" | "ellipse" | "oval" | "circle" | "point" | "egg" | "triangle" | "plaintext" | "plain" | "diamond" | "trapezium" | "parallelogram" | "house" | "pentagon" | "hexagon" | "septagon" | "octagon" | "doublecircle" | "doubleoctagon" | "tripleoctagon" | "invtriangle" | "invtrapezium" | "invhouse" | "Mdiamond" | "Msquare" | "Mcircle" | "rect" | "rectangle" | "square" | "star" | "none" | "underline" | "cylinder" | "note" | "tab" | "folder" | "box3d" | "component" | "promoter" | "cds" | "terminator" | "utr" | "primersite" | "restrictionsite" | "fivepoverhang" | "threepoverhang" | "noverhang" | "assembly" | "signature" | "insulator" | "ribosite" | "rnastab" | "proteasesite" | "proteinstab" | "rpromoter" | "rarrow" | "larrow" | "lpromoter" | "record"; declare type JssmArrowDirection = 'left' | 'right' | 'both'; declare type JssmArrowKind = 'none' | 'legal' | 'main' | 'forced'; diff --git a/package-lock.json b/package-lock.json index e9b277dd..b0b3f748 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "jssm", - "version": "5.33.1", + "version": "5.34.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/ts/jssm_types.ts b/src/ts/jssm_types.ts index e6c6b03b..11b6009a 100644 --- a/src/ts/jssm_types.ts +++ b/src/ts/jssm_types.ts @@ -17,9 +17,14 @@ type JssmColor = string; // TODO FIXME constrain to #RRGGBBAA later // type JssmPermitted = 'required' | 'disallowed'; type JssmPermittedOpt = 'required' | 'disallowed' | 'optional'; -type JssmArrow = '->' | '<->' | '<=->' | '<~->' - | '=>' | '<=>' | '<-=>' | '<~=>' - | '~>' | '<~>' | '<-~>' | '<=~>'; +type JssmArrow = '->' | '<-' | '<->' | '<=->' | '<~->' + | '=>' | '<=' | '<=>' | '<-=>' | '<~=>' + | '~>' | '<~' | '<~>' | '<-~>' | '<=~>'; + // | '⇒' | '⇐' | '⇔' | '⇐→' | '↚→' + // | '→' | '←' | '↔' | '←⇒' | '↚⇒' + // | '↛' | '↚' | '↮' | '←↛' | '⇐↛'; + +// TODO finish the arrow types - unicode *and* mixed type JssmShape = "box" | "polygon" | "ellipse" | "oval" | "circle" | "point" | "egg" | "triangle" | "plaintext" | "plain" | "diamond" | "trapezium" | "parallelogram" | "house" | "pentagon"