components start

r3-completion.bash

@@ -21,7 +21,7 @@ r3_completions() {
   fi
 
   if [ "${#COMP_WORDS[@]}" == "5" ] && [ "${COMP_WORDS[3]}" == "extends" ] ; then
-    local classes=$(grep "^class" "${R3_INSTALL_PATH}"/r3-libs/r3-v2/src/r3/*.js | perl -pe "s/.*class\s*(\w.*?)\s.*/\1/" | perl -pe 's/\n/ /g')
+    local classes=$(grep "^class" "${R3_INSTALL_PATH}"/r3-libs/r3-v2/src/r3/*.js "${R3_INSTALL_PATH}"/r3-libs/r3-v2/src/r3/r3-component/*.js | perl -pe "s/.*class\s*(\w.*?)\s.*/\1/" | perl -pe 's/\n/ /g')
     COMPREPLY=($(compgen -W "${classes}" "${COMP_WORDS[4]}"))
   fi
 
@@ -30,10 +30,14 @@ r3_completions() {
     COMPREPLY=($(compgen -W "${classes}" "${COMP_WORDS[4]}"))
   fi
 
-  if [[ "${#COMP_WORDS[@]}" == "5" && ( "${COMP_WORDS[3]}" == "normal"  ||  "${COMP_WORDS[3]}" == "static" ) ]]; then
+  if [[ "${#COMP_WORDS[@]}" == "5" && ( "${COMP_WORDS[3]}" == "normal"  ||  "${COMP_WORDS[3]}" == "static") ]]; then
     COMPREPLY=($(compgen -W "$(find "${R3_SRC_FOLDER}" -ls | grep drw | sed "s/.*src\/r3/./" | sed "s/$/\//" | sed "s/\/\//\//g"  | perl -pe 's/\n/ /g')" "${COMP_WORDS[4]}"))
   fi
 
+  if [[ "${#COMP_WORDS[@]}" == "6" && ( "${COMP_WORDS[3]}" == "extends") ]]; then
+    COMPREPLY=($(compgen -W "$(find "${R3_SRC_FOLDER}" -ls | grep drw | sed "s/.*src\/r3/./" | sed "s/$/\//" | sed "s/\/\//\//g"  | perl -pe 's/\n/ /g')" "${COMP_WORDS[5]}"))
+  fi
+
 }
 
 complete -F r3_completions r3

r3-libs/r3-v2

@@ -1 +1 @@
-Subproject commit cc264237b91de1451bb81aa415390b96d15c647c
+Subproject commit 40c9c5500959305ce56ea589ac06be13bf795efb

r3.sh

@@ -62,6 +62,7 @@ R3_V2_LIB_PATH=${R3_INSTALL_PATH}/r3-libs/r3-v2
 R3_V2_SRC_PATH=${R3_INSTALL_PATH}/r3-libs/r3-v2/src
 R3_FOLDER="${R3_V2_SRC_PATH}/r3/"
 R3_SYSTEM_FOLDER="${R3_V2_SRC_PATH}/r3/r3-system/"
+R3_COMPONENT_FOLDER="${R3_V2_SRC_PATH}/r3/r3-component/"
 TEMPLATE_FOLDER="${R3_V2_SRC_PATH}/templates/"
 
 CWD=$(pwd)
@@ -103,6 +104,16 @@ then
     if [ "${ARG2}" = "extends" ]; then
       EXTEND_CLASS="${ARG3}"
       EXTEND_CLASS_FILE_NAME="r3$(echo "${EXTEND_CLASS}" | sed 's/\([A-Z]\)/-\1/g' |  awk '{print tolower($0)}').js"
+
+      SUBFOLDER="${ARG4}"
+      SLASH_COUNT=$(echo "${SUBFOLDER}" | perl -lne 'END {print $c} map ++$c, /\//g')
+
+      for ((i=1; i < SLASH_COUNT; i++)) do
+        INCLUDE_PATH="../$INCLUDE_PATH"
+      done
+
+      R3_FOLDER="${R3_FOLDER}${SUBFOLDER}"
+
       echo "Creating class ${CLASS_NAME} based on template ${TEMPLATE} extending ${EXTEND_CLASS} and saving to ${R3_FOLDER}${FILE_NAME}"
     fi
 
@@ -191,6 +202,26 @@ then
 
     echo "Created class ${R3_FOLDER}${FILE_NAME}"
 
+#    cd "${R3_V2_LIB_PATH}" 2>&1 || exit 3
+#
+#    ./update_templates.php "${R3_FOLDER}${FILE_NAME}" save
+#    RESULT=$?
+#    if [ "${RESULT}" = 1 ];
+#    then
+#      exit 5
+#    fi
+#
+#    ./update_templates.php "${R3_FOLDER}${FILE_NAME}" restore
+#    RESULT=$?
+#    if [ "${RESULT}" = 1 ];
+#    then
+#      exit 5
+#    fi
+#
+#    ./update_templates.php all build-graph
+#
+#    cd - 2>&1 || exit 3
+
     exit 0;
 fi
 
@@ -226,6 +257,10 @@ check_file_found() {
     FILE="${R3_SYSTEM_FOLDER}${ORIG_FILE}"
   fi
 
+  if [ ! -f "${FILE}" ]; then
+    FILE="${R3_COMPONENT_FOLDER}${ORIG_FILE}"
+  fi
+
   if [ ! -f "${FILE}" ]; then
     exit 4
   fi
@@ -255,6 +290,8 @@ then
 
     echo "updating templates"
 
+    r3 update-token-db
+
     cd "${R3_V2_LIB_PATH}" 2>&1 || exit 3
 
     COMMANDS=$(grep "r3 create" .r3_history | sed "s/^.*r3 /r3 /" | sed "s/\s+/ /g" | sort --unique | perl -pe "s/\n/,/" | perl -pe "s/\s+,/,/g" | perl -pe "s/,$//")