Added s-expression

ekuiter · Mar 24, 2019 · 0d442f1 · 0d442f1
1 parent d9d0bdb
commit 0d442f1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 242 deletions.
diff --git a/client/package.json b/client/package.json
@@ -31,6 +31,7 @@
     "redux-persist": "^5.10.0",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
+    "s-expression": "^3.0.3",
     "svg2pdf.js": "1.2.1",
     "typesafe-actions": "^2.0.4",
     "uuid": "^3.3.2"

diff --git a/client/src/modeling/FeatureModel.ts b/client/src/modeling/FeatureModel.ts
@@ -15,7 +15,8 @@ import {present} from '../helpers/present';
 import logger from '../helpers/logger';
 import {FeatureNode, Feature, KernelFeatureModel, DESCRIPTION, ABSTRACT, HIDDEN, OPTIONAL, NAME, KernelFeature, KernelConstraint, CONSTRAINTS, ConstraintType, FEATURES, CHILDREN_CACHE, KernelConstraintFormula, GRAVEYARDED, FORMULA, ID_KEY, KernelConstraintFormulaAtom, GROUP_TYPE, GroupType, NIL} from './types';
 import {getViewportWidth, getViewportHeight} from '../helpers/withDimensions';
-import SParse from './s-expression';
+// @ts-ignore: no declarations available for s-expression
+import SParse from 's-expression';
 
 export function getID(node: FeatureNode): string {
     return node.data[ID_KEY]!;

diff --git a/client/src/modeling/s-expression.js b/client/src/modeling/s-expression.js
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -6849,6 +6849,11 @@ rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
+s-expression@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/s-expression/-/s-expression-3.0.3.tgz#80309bfea6bcf80960b61bb22f4498d17860799d"
+  integrity sha1-gDCb/qa8+AlgthuyL0SY0XhgeZ0=
+
 [email protected], safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"