Moving metadata.json to typescript

src/components/DialogBox/CombinationalAnalysis.vue

@@ -23,8 +23,8 @@
 import { stripTags } from '#/simulator/src/utils'
 import { useState } from '#/store/SimulatorStore/state'
 import messageBox from '@/MessageBox/messageBox.vue'
-import { ref } from '@vue/reactivity'
-import { onMounted, onUpdated } from '@vue/runtime-core'
+import { ref } from 'vue'
+import { onMounted, onUpdated } from 'vue'
 
 /* imports from combinationalAnalysis.js */
 import Node from '#/simulator/src/node'
@@ -199,7 +199,7 @@ function createLogicTable() {
         SimulatorState.dialogBox.combinationalanalysis_dialog = false
         output.value = []
         solveBooleanFunction(booleanInputVariables, booleanExpression)
-        if (output != null) {
+        if (output.value != null) {
             createBooleanPrompt(booleanInputVariables, booleanExpression)
         }
     } else if (

src/components/DialogBox/ExportVerilog.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from '@vue/runtime-core'
+import { onMounted, ref } from 'vue'
 import { useState } from '#/store/SimulatorStore/state'
 const SimulatorState = useState()
 import Codemirror from 'codemirror-editor-vue3'

src/components/DialogBox/OpenOffline.vue

@@ -64,7 +64,7 @@
 <script lang="ts" setup>
 import load from '#/simulator/src/data/load'
 import { useState } from '#/store/SimulatorStore/state'
-import { onMounted, onUpdated, ref, toRaw } from '@vue/runtime-core'
+import { onMounted, onUpdated, ref, toRaw } from 'vue'
 const SimulatorState = useState()
 const projectList = ref({})
 onMounted(() => {

src/components/DialogBox/Themes/ApplyThemes.vue

@@ -144,7 +144,7 @@
 
 <script lang="ts" setup>
 import { useState } from '#/store/SimulatorStore/state'
-import { onMounted, onUpdated, ref } from '@vue/runtime-core'
+import { onMounted, onUpdated, ref } from 'vue'
 import themeOptions from '#/simulator/src/themer/themes'
 import {
     getThemeCardSvg,

src/components/Panels/ElementsPanel/ElementsPanel.vue

@@ -141,13 +141,12 @@
 
 <script lang="ts" setup>
 import PanelHeader from '../Shared/PanelHeader.vue'
-import metadata from '#/simulator/src/metadata.json'
+import { elementHierarchy } from '#/simulator/src/metadata'
 import simulationArea from '#/simulator/src/simulationArea'
 import { uxvar } from '#/simulator/src/ux'
 import modules from '#/simulator/src/modules'
 import { onBeforeMount, ref } from 'vue'
 var panelData = []
-window.elementHierarchy = metadata.elementHierarchy
 window.elementPanelList = []
 
 onBeforeMount(() => {
@@ -175,7 +174,7 @@ function getImgUrl(elementName) {
 
 var elementInput = ref('')
 function searchElements() {
-    if (!elementInput) return []
+    if (!elementInput.value) return []
     // logic imported from listener.js
     const result = elementPanelList.filter((ele) =>
         ele.toLowerCase().includes(elementInput.value.toLowerCase())
@@ -237,4 +236,4 @@ function getTooltipText(elementName) {
 .v-expansion-panel-title {
     min-height: 36px;
 }
-</style>
+</style>#/simulator/src/metadata

src/components/Panels/PropertiesPanel/ModuleProperty/ModuleProperty.vue

@@ -30,8 +30,8 @@ import HelpButton from '#/components/Panels/Shared/HelpButton.vue'
 import ElementProperty from '#/components/Panels/PropertiesPanel/ModuleProperty/ElementProperty/ElementProperty.vue'
 import ProjectProperty from '#/components/Panels/PropertiesPanel/ModuleProperty/ProjectProperty/ProjectProperty.vue'
 import SubcircuitProperty from '#/components/Panels/PropertiesPanel/ModuleProperty/SubcircuitProperty/SubcircuitProperty.vue'
-import { ref, toRefs } from '@vue/reactivity'
-import { onMounted } from '@vue/runtime-core'
+import { ref, toRefs } from 'vue'
+import { onMounted } from 'vue'
 
 const props = defineProps({
     panleBodyData: { type: Object, default: undefined },

src/globalVariables.ts

@@ -23,5 +23,3 @@ window.embed = false
 window.width = undefined
 window.height = undefined
 window.DPR = window.devicePixelRatio || 1 // devicePixelRatio, 2 for retina displays, 1 for low resolution displays
-
-window.elementHierarchy = []

src/simulator/src/canvasApi.js

@@ -3,6 +3,7 @@ import backgroundArea from './backgroundArea'
 import simulationArea from './simulationArea'
 import miniMapArea, { removeMiniMap, updatelastMinimapShown } from './minimap'
 import { colors } from './themer/themer'
+import { updateOrder } from './metadata'
 
 var unit = 10
 

src/simulator/src/circuit.js

@@ -38,6 +38,7 @@ import { SimulatorStore } from '#/store/SimulatorStore/SimulatorStore'
 import { toRefs } from 'vue'
 import { provideCircuitName } from '#/components/helpers/promptComponent/PromptComponent.vue'
 import { deleteCurrentCircuit } from '#/components/helpers/deleteCircuit/DeleteCircuit.vue'
+import { inputList, moduleList } from './metadata'
 
 export const circuitProperty = {
     toggleLayoutMode,

src/simulator/src/data/backupCircuit.js

@@ -1,4 +1,6 @@
 import { projectSavedSet } from './project'
+import { moduleList, updateOrder } from '../metadata'
+
 /* eslint-disable no-param-reassign */
 function extract(obj) {
     return obj.saveObject()

src/simulator/src/data/load.js

@@ -21,6 +21,8 @@ import plotArea from '../plotArea'
 import { updateTestbenchUI, TestbenchData } from '../testbench'
 import { SimulatorStore } from '#/store/SimulatorStore/SimulatorStore'
 import { toRefs } from 'vue'
+import { moduleList } from '../metadata'
+
 /**
  * Backward compatibility - needs to be deprecated
  * @param {CircuitElement} obj - the object to be rectified

src/simulator/src/data/save.js

@@ -17,6 +17,7 @@ import { provideProjectName } from '#/components/helpers/promptComponent/PromptC
 import { UpdateProjectDetail } from '#/components/helpers/createNewProject/UpdateProjectDetail.vue'
 import { confirmOption } from '#/components/helpers/confirmComponent/ConfirmComponent.vue'
 import { getToken } from '#/pages/simulatorHandler.vue'
+import { renderOrder } from '../metadata'
 
 // var projectName = undefined
 
@@ -236,7 +237,7 @@ export function generateImage(
         simulationArea.context.fill()
     }
 
-    // Draw circuits, why is it updateOrder and not renderOrder?
+    // Draw circuits
     for (let i = 0; i < renderOrder.length; i++) {
         for (let j = 0; j < scope[renderOrder[i]].length; j++) {
             scope[renderOrder[i]][j].draw()

src/simulator/src/engine.js

@@ -12,6 +12,7 @@ import { showError } from './utils'
 import miniMapArea from './minimap'
 import { resetup } from './setup'
 import { verilogModeGet } from './Verilog2CV'
+import { renderOrder, updateOrder } from './metadata'
 
 /**
  * Core of the simulation and rendering algorithm.

src/simulator/src/events.js

@@ -13,6 +13,7 @@ import { getNextPosition } from './modules'
 import { generateId } from './utils'
 import simulationArea from './simulationArea'
 import { TestbenchData } from './testbench'
+import { moduleList, updateOrder } from './metadata'
 
 /**
  * Helper function to paste

src/simulator/src/layoutMode.js

@@ -19,6 +19,7 @@ import {
 import miniMapArea from './minimap'
 import { showMessage } from './utils'
 import { verilogModeSet } from './Verilog2CV'
+import { circuitElementList } from './metadata'
 
 /**
  * Layout.js - all subcircuit layout related code is here